From ec88760187560a0e30356135cab9bce186bc7363 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 10 Dec 2019 08:46:02 +0100 Subject: [PATCH] Fix Flake E241 One more step towards white space sanity. Next group is E20x. --- .flake8 | 2 +- ReviewBot.py | 4 ++-- container_cleaner.py | 4 ++-- devel-project.py | 2 +- factory-package-news/factory-package-news.py | 4 ++-- metrics.py | 2 +- osclib/accept_command.py | 2 +- osclib/cleanup_rings.py | 2 +- osclib/core.py | 2 +- project-installcheck.py | 2 +- tests/OBSLocal.py | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.flake8 b/.flake8 index ba14a2a9..b495f9ed 100644 --- a/.flake8 +++ b/.flake8 @@ -1,4 +1,4 @@ [flake8] exclude = .open-build-service/, abichecker, openqa, openqa-maintenance.py max-line-length = 100 -ignore = E501,F401,E302,E128,E251,E201,E202,E203,E305,F841,E265,E261,E266,E712,E401,E126,E502,E241,E711,E125,E123,W293,W391,E101,E713,E124,E127,E701,E714,W503,W504,E129,E741,E722,E731 +ignore = E501,F401,E302,E128,E251,E201,E202,E203,E305,F841,E265,E261,E266,E712,E401,E126,E502,E711,E125,E123,W293,W391,E101,E713,E124,E127,E701,E714,W503,W504,E129,E741,E722,E731 diff --git a/ReviewBot.py b/ReviewBot.py index 40f4934d..92036399 100644 --- a/ReviewBot.py +++ b/ReviewBot.py @@ -826,8 +826,8 @@ class CommandLineInterface(cmdln.Cmdln): def get_optparser(self): parser = cmdln.Cmdln.get_optparser(self) parser.add_option("--apiurl", '-A', metavar="URL", help="api url") - parser.add_option("--user", metavar="USER", help="reviewer user name") - parser.add_option("--group", metavar="GROUP", help="reviewer group name") + parser.add_option("--user", metavar="USER", help="reviewer user name") + parser.add_option("--group", metavar="GROUP", help="reviewer group name") parser.add_option("--dry", action="store_true", help="dry run") parser.add_option("--debug", action="store_true", help="debug output") parser.add_option("--osc-debug", action="store_true", help="osc debug output") diff --git a/container_cleaner.py b/container_cleaner.py index bed54428..2d369626 100755 --- a/container_cleaner.py +++ b/container_cleaner.py @@ -77,7 +77,7 @@ class ContainerCleaner(ToolBase.ToolBase): if srccontainer not in srccontainerarchs: srccontainerarchs[srccontainer] = [] - logging.debug("%s provides binaries for %s", srccontainer, arch) + logging.debug("%s provides binaries for %s", srccontainer, arch) srccontainerarchs[srccontainer] += [arch] # Now go through each bucket and find out what doesn't contribute to the newest five @@ -97,7 +97,7 @@ class ContainerCleaner(ToolBase.ToolBase): contributes = True if contributes: - logging.debug("%s contributes to %s", srccontainer, package) + logging.debug("%s contributes to %s", srccontainer, package) else: logging.info("%s does not contribute", srccontainer) if len([count for count in archs_found.values() if count > 0]) == 0: diff --git a/devel-project.py b/devel-project.py index 154d90d8..ca562f3e 100755 --- a/devel-project.py +++ b/devel-project.py @@ -281,7 +281,7 @@ if __name__ == '__main__': parser_notify = subparsers.add_parser('notify', help='notify maintainers of their packages') parser_notify.set_defaults(func=notify) - parser_notify.add_argument('--dry', action='store_true', help='dry run emails') + parser_notify.add_argument('--dry', action='store_true', help='dry run emails') parser_notify.add_argument("packages", nargs='*', help="packages to check") parser_requests = subparsers.add_parser('requests', help='List open requests.') diff --git a/factory-package-news/factory-package-news.py b/factory-package-news/factory-package-news.py index 4f682b05..b2f4a75b 100755 --- a/factory-package-news/factory-package-news.py +++ b/factory-package-news/factory-package-news.py @@ -103,8 +103,8 @@ class ChangeLogger(cmdln.Cmdln): raise Exception("Could not open %s as an ISO-9660 image." % arg) # On Tumbleweed, there is no '/suse' prefix - for path in ['/suse/x86_64', '/suse/noarch', '/suse/aarch64', '/suse/s390x', - '/x86_64', '/noarch', '/aarch64', '/s390x' ]: + for path in ['/suse/x86_64', '/suse/noarch', '/suse/aarch64', + '/suse/s390x', '/x86_64', '/noarch', '/aarch64', '/s390x' ]: file_stats = iso.readdir(path) if file_stats is None: continue diff --git a/metrics.py b/metrics.py index 69d20791..5c528578 100755 --- a/metrics.py +++ b/metrics.py @@ -211,7 +211,7 @@ def ingest_requests(api, project): tags['type'] = '_'.join(tags['type']) point('review', {'open_for': (completed_at - opened_at).total_seconds()}, completed_at, tags) - point('review_count', {'count': 1}, opened_at, tags, True) + point('review_count', {'count': 1}, opened_at, tags, True) point('review_count', {'count': -1}, completed_at, tags, True) found = [] diff --git a/osclib/accept_command.py b/osclib/accept_command.py index ba6de31c..dab9a9e3 100644 --- a/osclib/accept_command.py +++ b/osclib/accept_command.py @@ -249,7 +249,7 @@ class AcceptCommand(object): if product_spec != new_product: update_version_attr = True - url = self.api.makeurl(['source', project, product_pkg, product_name]) + url = self.api.makeurl(['source', project, product_pkg, product_name]) http_PUT(url + '?comment=Update+version', data=new_product) if update_version_attr: diff --git a/osclib/cleanup_rings.py b/osclib/cleanup_rings.py index 21be92d8..1894218b 100644 --- a/osclib/cleanup_rings.py +++ b/osclib/cleanup_rings.py @@ -73,7 +73,7 @@ class CleanupRings(object): self.links[mainpkg] = pkg def fill_pkgdeps(self, prj, repo, arch): - root = builddepinfo(self.api.apiurl, prj, repo, arch) + root = builddepinfo(self.api.apiurl, prj, repo, arch) for package in root.findall('package'): # use main package name for multibuild. We can't just ignore diff --git a/osclib/core.py b/osclib/core.py index c25a26fb..8ba5e81a 100644 --- a/osclib/core.py +++ b/osclib/core.py @@ -314,7 +314,7 @@ def source_file_save(apiurl, project, package, filename, content, comment=None): url = makeurl(apiurl, ['source', project, package, filename], {'comment': comment}) http_PUT(url, data=content) -def source_file_ensure(apiurl, project, package, filename, content, comment=None): +def source_file_ensure(apiurl, project, package, filename, content, comment=None): if content != source_file_load(apiurl, project, package, filename): source_file_save(apiurl, project, package, filename, content, comment) diff --git a/project-installcheck.py b/project-installcheck.py index 2eeb8e09..81f79830 100755 --- a/project-installcheck.py +++ b/project-installcheck.py @@ -187,7 +187,7 @@ class RepoChecker(): for line in difflib.unified_diff(old_output, per_source[source]['output'], 'before', 'now'): self.logger.debug(line.strip()) oldstate['check'][source] = {'problem': per_source[source]['output'], - 'rebuild': str(datetime.datetime.now())} + 'rebuild': str(datetime.datetime.now())} for source in list(oldstate['check']): if not source.startswith('{}/{}/{}/'.format(project, repository, arch)): diff --git a/tests/OBSLocal.py b/tests/OBSLocal.py index a62824d5..e2c8d984 100644 --- a/tests/OBSLocal.py +++ b/tests/OBSLocal.py @@ -312,7 +312,7 @@ class StagingWorkflow(object): source_package.name)) return target_package - def create_project(self, name, reviewer={}, maintainer={}, project_links=[]): + def create_project(self, name, reviewer={}, maintainer={}, project_links=[]): if isinstance(name, Project): return name if name in self.projects: