From 5fb2f55a0abc5f203b7af7432e53a3afbbb95491 Mon Sep 17 00:00:00 2001 From: Andrew Fyfe Date: Tue, 2 Jan 2018 17:39:06 +0000 Subject: [PATCH] silence pep8 warnings for mixed case method names and append _ to reserved names --- modoboa/admin/lib.py | 4 ++-- .../admin/management/commands/subcommands/_mx.py | 4 +++- modoboa/admin/tests/test_api.py | 13 +++++++------ modoboa/admin/tests/test_domain.py | 4 ++-- modoboa/admin/tests/test_import_.py | 4 ++-- modoboa/admin/tests/test_mx.py | 14 ++++++++------ 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/modoboa/admin/lib.py b/modoboa/admin/lib.py index 96beb2608..87b19d8fe 100644 --- a/modoboa/admin/lib.py +++ b/modoboa/admin/lib.py @@ -1,4 +1,4 @@ -# coding: utf-8 +# -*- coding: utf-8 -*- """Internal library for admin.""" @@ -222,7 +222,7 @@ def domain_has_authorized_mx(name): valid_mxs = [ipaddress.ip_network(smart_text(v.strip())) for v in valid_mxs.split() if v.strip()] domain_mxs = get_domain_mx_list(name) - for mx_addr, mx_ip_addr in domain_mxs: + for mx_addr, mx_ip_addr in domain_mxs: # noqa:B007 for subnet in valid_mxs: if mx_ip_addr in subnet: return True diff --git a/modoboa/admin/management/commands/subcommands/_mx.py b/modoboa/admin/management/commands/subcommands/_mx.py index b86955eae..009d4ec81 100644 --- a/modoboa/admin/management/commands/subcommands/_mx.py +++ b/modoboa/admin/management/commands/subcommands/_mx.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + """Management command to check defined domains.""" from __future__ import print_function, unicode_literals @@ -24,7 +26,7 @@ from modoboa.parameters import tools as param_tools class CheckMXRecords(BaseCommand): """Command class.""" - help = "Check defined domains." + help = "Check defined domains." # noqa:A003 @cached_property def providers(self): diff --git a/modoboa/admin/tests/test_api.py b/modoboa/admin/tests/test_api.py index 7078d616b..afe4eab2e 100644 --- a/modoboa/admin/tests/test_api.py +++ b/modoboa/admin/tests/test_api.py @@ -1,4 +1,5 @@ -# coding: utf-8 +# -*- coding: utf-8 -*- + """Admin API related tests.""" from __future__ import unicode_literals @@ -27,7 +28,7 @@ class DomainAPITestCase(ModoAPITestCase): """Check API.""" @classmethod - def setUpTestData(cls): + def setUpTestData(cls): # noqa: N802 """Create test data.""" super(DomainAPITestCase, cls).setUpTestData() factories.populate_database() @@ -137,7 +138,7 @@ class DomainAliasAPITestCase(ModoAPITestCase): """Check DomainAlias API.""" @classmethod - def setUpTestData(cls): + def setUpTestData(cls): # noqa: N802 """Create test data.""" super(DomainAliasAPITestCase, cls).setUpTestData() factories.populate_database() @@ -231,7 +232,7 @@ class AccountAPITestCase(ModoAPITestCase): } @classmethod - def setUpTestData(cls): + def setUpTestData(cls): # noqa: N802 """Create test data.""" super(AccountAPITestCase, cls).setUpTestData() factories.populate_database() @@ -544,7 +545,7 @@ class AliasAPITestCase(ModoAPITestCase): } @classmethod - def setUpTestData(cls): + def setUpTestData(cls): # noqa: N802 """Create test data.""" super(AliasAPITestCase, cls).setUpTestData() cls.localconfig.parameters.set_value( @@ -667,7 +668,7 @@ class SenderAddressAPITestCase(ModoAPITestCase): """Check SenderAddress API.""" @classmethod - def setUpTestData(cls): + def setUpTestData(cls): # noqa: N802 """Create test data.""" super(SenderAddressAPITestCase, cls).setUpTestData() cls.localconfig.parameters.set_value( diff --git a/modoboa/admin/tests/test_domain.py b/modoboa/admin/tests/test_domain.py index c497e44c8..da61d7cea 100644 --- a/modoboa/admin/tests/test_domain.py +++ b/modoboa/admin/tests/test_domain.py @@ -1,4 +1,4 @@ -# coding: utf-8 +# -*- coding: utf-8 -*- """Domain related test cases.""" @@ -22,7 +22,7 @@ class DomainTestCase(ModoTestCase): """Test case for Domain.""" @classmethod - def setUpTestData(cls): + def setUpTestData(cls): # noqa: N802 """Create test data.""" super(DomainTestCase, cls).setUpTestData() factories.populate_database() diff --git a/modoboa/admin/tests/test_import_.py b/modoboa/admin/tests/test_import_.py index 4444797b7..46a18d64c 100644 --- a/modoboa/admin/tests/test_import_.py +++ b/modoboa/admin/tests/test_import_.py @@ -1,4 +1,4 @@ -# coding: utf-8 +# -*- coding: utf-8 -*- from __future__ import unicode_literals @@ -20,7 +20,7 @@ from ..models import Domain, Alias, DomainAlias class ImportTestCase(ModoTestCase): @classmethod - def setUpTestData(cls): + def setUpTestData(cls): # noqa: N802 """Create test data.""" super(ImportTestCase, cls).setUpTestData() cls.localconfig.parameters.set_value( diff --git a/modoboa/admin/tests/test_mx.py b/modoboa/admin/tests/test_mx.py index 38361b406..e1ddb0ac0 100644 --- a/modoboa/admin/tests/test_mx.py +++ b/modoboa/admin/tests/test_mx.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + """DNSBL related tests.""" from __future__ import unicode_literals @@ -25,7 +27,7 @@ class MXTestCase(ModoTestCase): """TestCase for DNSBL related features.""" @classmethod - def setUpTestData(cls): + def setUpTestData(cls): # noqa:N802 """Create some data.""" super(MXTestCase, cls).setUpTestData() cls.domain = factories.DomainFactory(name="modoboa.org") @@ -64,17 +66,17 @@ class MXTestCase(ModoTestCase): # we passed a ttl to 0. this will reset the cache this time qs = models.MXRecord.objects.filter(domain=self.domain) - id = qs[0].id + id_ = qs[0].id management.call_command("modo", "check_mx", "--no-dnsbl", "--ttl=7200") qs = models.MXRecord.objects.filter(domain=self.domain) - self.assertNotEqual(id, qs[0].id) - id = qs[0].id + self.assertNotEqual(id_, qs[0].id) + id_ = qs[0].id # assume that mxrecords ids are the same. means that we taking care of # ttl management.call_command("modo", "check_mx", "--no-dnsbl") qs = models.MXRecord.objects.filter(domain=self.domain) - self.assertEqual(id, qs[0].id) + self.assertEqual(id_, qs[0].id) @patch("gevent.socket.gethostbyname") @patch("socket.getaddrinfo") @@ -137,7 +139,7 @@ class DNSBLTestCase(ModoTestCase): """TestCase for DNSBL related features.""" @classmethod - def setUpTestData(cls): + def setUpTestData(cls): # noqa:N802 """Create some data.""" super(DNSBLTestCase, cls).setUpTestData() cls.domain = factories.DomainFactory(name="modoboa.org")