From e08ca2c9c807b4d2b7f7b65c5ed73f4dcf795c8b Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Wed, 26 May 2021 11:26:00 +0200
Subject: [PATCH] Fix spacing inconsistencies brought to light by flake8

It has many grumbles about spacing, but at least this code is
currently consistent about its departure from PEP8's spacing rules
(and closer to Qt's) for the present. We can review whether to do a
drastic spacing revolution later.

Change-Id: Ife4e8a5b02b63434bd9c7ac7ba4cbc11b6311f9f
Reviewed-by: Mate Barany <mate.barany@qt.io>
---
 util/locale_database/enumdata.py       | 2 +-
 util/locale_database/ldml.py           | 4 ++--
 util/locale_database/qlocalexml.py     | 2 +-
 util/locale_database/qlocalexml2cpp.py | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/util/locale_database/enumdata.py b/util/locale_database/enumdata.py
index 1749b85f631..66b8840cb11 100644
--- a/util/locale_database/enumdata.py
+++ b/util/locale_database/enumdata.py
@@ -434,7 +434,7 @@ language_aliases = {
     'Navaho': 'Navajo',
     'Oriya': 'Odia',
     'Kirghiz': 'Kyrgyz'
-    }
+}
 
 territory_map = {
       0: ("AnyTerritory",                                 "ZZ"),
diff --git a/util/locale_database/ldml.py b/util/locale_database/ldml.py
index eaf5d66f65a..b94c2421725 100644
--- a/util/locale_database/ldml.py
+++ b/util/locale_database/ldml.py
@@ -417,7 +417,7 @@ class LocaleScanner (object):
         ('long', 'format', 'wide'),
         ('short', 'format', 'abbreviated'),
         ('narrow', 'format', 'narrow'),
-        ) # Used for month and day names
+    ) # Used for month and day names
 
     def __find(self, xpath):
         retries, foundNone = [ xpath.split('/') ], True
@@ -485,7 +485,7 @@ class LocaleScanner (object):
             return self.find(stem + 'displayName')
         except Error:
             pass
-        for x in  ('zero', 'one', 'two', 'few', 'many', 'other'):
+        for x in ('zero', 'one', 'two', 'few', 'many', 'other'):
             try:
                 return self.find(f'{stem}displayName[count={x}]')
             except Error:
diff --git a/util/locale_database/qlocalexml.py b/util/locale_database/qlocalexml.py
index e31ec4af68f..a104402e230 100644
--- a/util/locale_database/qlocalexml.py
+++ b/util/locale_database/qlocalexml.py
@@ -619,7 +619,7 @@ class Locale (object):
                        (fullName, fullName),
                        (fullName, fullName),
                        (number, number)),
-            },
+                     },
                      sizes=('long', 'short', 'narrow')):
         for cal in calendars:
             try:
diff --git a/util/locale_database/qlocalexml2cpp.py b/util/locale_database/qlocalexml2cpp.py
index b770049cca8..a884459ae3b 100755
--- a/util/locale_database/qlocalexml2cpp.py
+++ b/util/locale_database/qlocalexml2cpp.py
@@ -283,7 +283,7 @@ class LocaleDataWriter (LocaleSourceEditor):
                              locale.minus, locale.plus, locale.exp,
                              locale.quotationStart, locale.quotationEnd,
                              locale.alternateQuotationStart, locale.alternateQuotationEnd)) +
-                      tuple (date_format_data.append(f) for f in # 2 entries:
+                      tuple(date_format_data.append(f) for f in # 2 entries:
                              (locale.longDateFormat, locale.shortDateFormat)) +
                       tuple(time_format_data.append(f) for f in # 2 entries:
                             (locale.longTimeFormat, locale.shortTimeFormat)) +