From 8483632683fc4f16a2feb4bf4dfdf2d11ca87597 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 27 Nov 2019 10:40:15 +0100 Subject: [PATCH] Some flake8 improvements Was bored while waiting for a test run to finish. The rule is that two empty lines distinguish larger blocks and shouldn't be used between functions or within functions. --- .flake8 | 2 +- ToolBase.py | 1 - biarchtool.py | 1 - check_maintenance_incidents.py | 1 - factory-package-news/factory-package-news.py | 2 -- fcc_submitter.py | 1 - manager_42.py | 2 -- osc-origin.py | 1 - osclib/cleanup_rings.py | 1 - osclib/prio_command.py | 1 - osclib/stagingapi.py | 1 - tests/api_tests.py | 1 - tests/maintenance_tests.py | 2 -- tests/origin_tests.py | 1 - 14 files changed, 1 insertion(+), 17 deletions(-) diff --git a/.flake8 b/.flake8 index 20c9d9c2..1e42383a 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,E228,E128,E251,E201,E202,E203,E305,F841,E265,E261,E266,E712,E401,E126,E502,E222,E241,E711,E226,E125,E123,W293,W391,E731,E101,E227,E713,E225,E124,E221,E127,E701,E714,W503,W504,E129,E303,E741,E722 +ignore = E501,F401,E302,E228,E128,E251,E201,E202,E203,E305,F841,E265,E261,E266,E712,E401,E126,E502,E222,E241,E711,E226,E125,E123,W293,W391,E101,E227,E713,E225,E124,E221,E127,E701,E714,W503,W504,E129,E741,E722,E731 diff --git a/ToolBase.py b/ToolBase.py index 8a0d22e5..b70dfddc 100644 --- a/ToolBase.py +++ b/ToolBase.py @@ -107,7 +107,6 @@ class ToolBase(object): query = [] if not query else query return osc.core.makeurl(self.apiurl, l, query) - def process(self, packages): """ reimplement this """ True diff --git a/biarchtool.py b/biarchtool.py index 31df6824..01931bfd 100755 --- a/biarchtool.py +++ b/biarchtool.py @@ -249,7 +249,6 @@ class BiArchTool(ToolBase.ToolBase): except HTTPError as e: logger.error('failed to update %s: %s', pkg, e) - def enable_baselibs_packages(self, force=False, wipebinaries=False): self._init_biarch_packages() todo = dict() diff --git a/check_maintenance_incidents.py b/check_maintenance_incidents.py index 91d14c81..dfb1148f 100755 --- a/check_maintenance_incidents.py +++ b/check_maintenance_incidents.py @@ -137,7 +137,6 @@ class MaintenanceChecker(ReviewBot.ReviewBot): return True - def check_one_request(self, req): self.add_factory_source = False self.needs_maintainer_review = set() diff --git a/factory-package-news/factory-package-news.py b/factory-package-news/factory-package-news.py index 145d8e6f..493e0edc 100755 --- a/factory-package-news/factory-package-news.py +++ b/factory-package-news/factory-package-news.py @@ -176,7 +176,6 @@ class ChangeLogger(cmdln.Cmdln): pprint(pkgs[package]) pprint(changelogs[pkgs[package]['sourcerpm']]) - def _get_packages_grouped(self, pkgs, names): group = dict() for pkg in names: @@ -186,7 +185,6 @@ class ChangeLogger(cmdln.Cmdln): group[pkgs[pkg]['sourcerpm']].append(pkg) return group - @cmdln.option("--dir", action="store", type='string', dest='dir', help="data directory") def do_diff(self, subcmd, opts, version1, version2): """${cmd_name}: diff two snapshots diff --git a/fcc_submitter.py b/fcc_submitter.py index 9a601031..88eb316a 100755 --- a/fcc_submitter.py +++ b/fcc_submitter.py @@ -408,7 +408,6 @@ class FccSubmitter(object): print('None') - def main(args): # Configure OSC osc.conf.get_config(override_apiurl=args.apiurl) diff --git a/manager_42.py b/manager_42.py index 563b4c4f..a68044ad 100755 --- a/manager_42.py +++ b/manager_42.py @@ -153,7 +153,6 @@ class Manager42(object): return self.cached_GET(makeurl(self.apiurl, ['source', project, package], opts)) - def crawl(self, packages): """Main method of the class that runs the crawler.""" @@ -232,7 +231,6 @@ class Manager42(object): return None raise - def _is_ignored(self, package): if package in self.config.ignored_packages: logger.debug("%s in ignore list", package) diff --git a/osc-origin.py b/osc-origin.py index ca35aa5a..f362f5cd 100644 --- a/osc-origin.py +++ b/osc-origin.py @@ -345,7 +345,6 @@ def osrt_origin_report(apiurl, opts, *args): for package, origins in sorted(package_diff.items()): report.append(line_format.format(package, *origins)) - body = '\n'.join(report) print(body) diff --git a/osclib/cleanup_rings.py b/osclib/cleanup_rings.py index abece684..aed68411 100644 --- a/osclib/cleanup_rings.py +++ b/osclib/cleanup_rings.py @@ -72,7 +72,6 @@ class CleanupRings(object): print("osc linkpac -f {}/{} {}/{}".format(destring, mainpkg, prj, pkg)) self.links[mainpkg] = pkg - def fill_pkgdeps(self, prj, repo, arch): root = builddepinfo(self.api.apiurl, prj, repo, arch) diff --git a/osclib/prio_command.py b/osclib/prio_command.py index 57b448ba..c8d71c7d 100644 --- a/osclib/prio_command.py +++ b/osclib/prio_command.py @@ -36,7 +36,6 @@ class PrioCommand(object): except HTTPError as e: print(e) - def perform(self, projects=None, priority=None): """ Set priority on specific stagings or all of them at once diff --git a/osclib/stagingapi.py b/osclib/stagingapi.py index e3022629..cd18a920 100644 --- a/osclib/stagingapi.py +++ b/osclib/stagingapi.py @@ -174,7 +174,6 @@ class StagingAPI(object): if (retry_sleep_seconds % 60): retry_sleep_seconds += 1 - def retried_GET(self, url): return self._retried_request(url, http_GET) diff --git a/tests/api_tests.py b/tests/api_tests.py index c46d0d1a..fcfcd111 100644 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -125,7 +125,6 @@ class TestApiCalls(OBSLocal.TestCase): xpath = "//review[@name='new' and @by_project='{}']".format(self.staging_b.name) self.assertIsNotNone(rq.xpath(xpath)) - def test_add_sr(self): # setup is already adding the request, we just verify prj = self.staging_b.name diff --git a/tests/maintenance_tests.py b/tests/maintenance_tests.py index 7a412784..e2b2d9e1 100644 --- a/tests/maintenance_tests.py +++ b/tests/maintenance_tests.py @@ -274,8 +274,6 @@ class TestMaintenance(unittest.TestCase): self.assertFalse(result['devel_review_added']) - - def test_backports_submit(self): httpretty.register_uri(httpretty.GET, diff --git a/tests/origin_tests.py b/tests/origin_tests.py index 6bb47116..5f6393c1 100644 --- a/tests/origin_tests.py +++ b/tests/origin_tests.py @@ -257,7 +257,6 @@ class TestOrigin(OBSLocal.TestCase): request = get_request(self.wf.apiurl, request_id_update) request_state_change(self.wf.apiurl, request_id_update, 'accepted') - devel_project_new = self.randomString('develnew') self.wf.create_package(devel_project_new, package) attribute_value_save(self.wf.apiurl, devel_project_new, 'ApprovedRequestSource', '', 'OBS')