minor: formatting / line-length fixes (#363)

* minor: formatting / line-length fixes

* fixup! minor: formatting / line-length fixes

* fixup! fixup! minor: formatting / line-length fixes

Author: blueyed

docs/helpers.rst

@@ -205,7 +205,7 @@ also directly concatenate a string to form a URL: ``live_server +
 ``settings``
 ~~~~~~~~~~~~
 
-This fixture will provide a handle on the django settings module, and
+This fixture will provide a handle on the Django settings module, and
 automatically revert any changes made to the settings (modifications, additions
 and deletions).
 

pytest_django/fixtures.py

@@ -58,7 +58,8 @@ def django_db_use_migrations(request):
 
 @pytest.fixture(scope='session')
 def django_db_keepdb(request):
-    return request.config.getvalue('reuse_db') and not request.config.getvalue('create_db')
+    return (request.config.getvalue('reuse_db') and not
+            request.config.getvalue('create_db'))
 
 
 @pytest.fixture(scope='session')
@@ -97,7 +98,8 @@ def django_db_setup(
 
     def teardown_database():
         with django_db_blocker:
-            (DiscoverRunner(verbosity=pytest.config.option.verbose, interactive=False)
+            (DiscoverRunner(verbosity=pytest.config.option.verbose,
+                            interactive=False)
              .teardown_databases(db_cfg))
 
     if not django_db_keepdb:

pytest_django/plugin.py

@@ -32,7 +32,8 @@
 from .fixtures import settings  # noqa
 from .fixtures import transactional_db  # noqa
 
-from .lazy_django import django_settings_is_configured, skip_if_no_django
+from .lazy_django import (django_settings_is_configured,
+                          get_django_version, skip_if_no_django)
 
 
 SETTINGS_MODULE_ENV = 'DJANGO_SETTINGS_MODULE'
@@ -140,7 +141,7 @@ def _setup_django():
 
     import django.conf
 
-    # Avoid trying to force-load Django when settings is not properly configured
+    # Avoid force-loading Django when settings are not properly configured.
     if not django.conf.settings.configured:
         return
 
@@ -203,7 +204,6 @@ def pytest_load_initial_conftests(early_config, parser, args):
         os.environ[INVALID_TEMPLATE_VARS_ENV] = 'true'
 
     # Configure DJANGO_SETTINGS_MODULE
-
     if options.ds:
         ds_source = 'command line option'
         ds = options.ds
@@ -218,7 +218,8 @@ def pytest_load_initial_conftests(early_config, parser, args):
         ds_source = None
 
     if ds:
-        early_config._dsm_report_header = 'django settings: %s (from %s)' % (ds, ds_source)
+        early_config._dsm_report_header = 'Django settings: %s (from %s)' % (
+            ds, ds_source)
     else:
         early_config._dsm_report_header = None
 
@@ -237,12 +238,12 @@ def pytest_load_initial_conftests(early_config, parser, args):
             import configurations.importer
             configurations.importer.install()
 
-        # Forcefully load django settings, throws ImportError or
+        # Forcefully load Django settings, throws ImportError or
         # ImproperlyConfigured if settings cannot be loaded.
-        from django.conf import settings  # noqa
+        from django.conf import settings as dj_settings
 
         with _handle_import_error(_django_project_scan_outcome):
-            settings.DATABASES
+            dj_settings.DATABASES
 
     _setup_django()
 
@@ -266,7 +267,8 @@ def _method_is_defined_at_leaf(cls, method_name):
         if hasattr(base_cls, method_name):
             super_method = getattr(base_cls, method_name)
 
-    assert super_method is not None, '%s could not be found in base class' % method_name
+    assert super_method is not None, (
+        '%s could not be found in base class' % method_name)
 
     return getattr(cls, method_name).__func__ is not super_method.__func__
 
@@ -332,9 +334,10 @@ def django_test_environment(request):
     """
     if django_settings_is_configured():
         _setup_django()
-        from django.conf import settings  # noqa
-        from django.test.utils import setup_test_environment, teardown_test_environment
-        settings.DEBUG = False
+        from django.conf import settings as dj_settings
+        from django.test.utils import (setup_test_environment,
+                                       teardown_test_environment)
+        dj_settings.DEBUG = False
         setup_test_environment()
         request.addfinalizer(teardown_test_environment)
 
@@ -348,10 +351,11 @@ def django_db_blocker():
     special database handling.
 
     The object is a context manager and provides the methods
-    .enable_database_access()/.disable_database_access() and .restore_database_access() to
-    temporarily enable database access.
+    .enable_database_access()/.disable_database_access() and
+    .restore_database_access() to temporarily enable database access.
 
-    This is an advanced feature that is meant to be used to implement database fixtures.
+    This is an advanced feature that is meant to be used to implement database
+    fixtures.
     """
     if not django_settings_is_configured():
         return None
@@ -480,22 +484,24 @@ def __mod__(self, var):
             """Handle TEMPLATE_STRING_IF_INVALID % var."""
             template = self._get_template()
             if template:
-                msg = "Undefined template variable '%s' in '%s'" % (var, template.name)
+                msg = "Undefined template variable '%s' in '%s'" % (
+                    var, template.name)
             else:
                 msg = "Undefined template variable '%s'" % var
             if self.fail:
                 pytest.fail(msg, pytrace=False)
             else:
                 return msg
-    if os.environ.get(INVALID_TEMPLATE_VARS_ENV, 'false') == 'true':
-        if django_settings_is_configured():
-            import django
-            from django.conf import settings  # noqa
 
-            if django.VERSION >= (1, 8) and settings.TEMPLATES:
-                settings.TEMPLATES[0]['OPTIONS']['string_if_invalid'] = InvalidVarException()
-            else:
-                settings.TEMPLATE_STRING_IF_INVALID = InvalidVarException()
+    if (os.environ.get(INVALID_TEMPLATE_VARS_ENV, 'false') == 'true' and
+            django_settings_is_configured()):
+        from django.conf import settings as dj_settings
+
+        if get_django_version() >= (1, 8) and dj_settings.TEMPLATES:
+            dj_settings.TEMPLATES[0]['OPTIONS']['string_if_invalid'] = (
+                InvalidVarException())
+        else:
+            dj_settings.TEMPLATE_STRING_IF_INVALID = InvalidVarException()
 
 
 @pytest.fixture(autouse=True)
@@ -505,13 +511,12 @@ def _template_string_if_invalid_marker(request):
     marker = request.keywords.get('ignore_template_errors', None)
     if os.environ.get(INVALID_TEMPLATE_VARS_ENV, 'false') == 'true':
         if marker and django_settings_is_configured():
-            import django
-            from django.conf import settings  # noqa
+            from django.conf import settings as dj_settings
 
-            if django.VERSION >= (1, 8) and settings.TEMPLATES:
-                settings.TEMPLATES[0]['OPTIONS']['string_if_invalid'].fail = False
+            if get_django_version() >= (1, 8) and dj_settings.TEMPLATES:
+                dj_settings.TEMPLATES[0]['OPTIONS']['string_if_invalid'].fail = False
             else:
-                settings.TEMPLATE_STRING_IF_INVALID.fail = False
+                dj_settings.TEMPLATE_STRING_IF_INVALID.fail = False
 
 # ############### Helper Functions ################
 
@@ -535,7 +540,7 @@ def _dj_db_wrapper(self):
             from django.db.backends import BaseDatabaseWrapper
 
         # The first time the _dj_db_wrapper is accessed, we will save a
-        # reference to the real implementation
+        # reference to the real implementation.
         if self._real_ensure_connection is None:
             self._real_ensure_connection = BaseDatabaseWrapper.ensure_connection
 

tests/test_django_settings_module.py

@@ -35,7 +35,8 @@ def test_ds():
     """)
     result = testdir.runpytest_subprocess()
     assert result.parseoutcomes()['passed'] == 1
-    result.stdout.fnmatch_lines(['django settings: tpkg.settings_ini (from ini file)*'])
+    result.stdout.fnmatch_lines(['Django settings: tpkg.settings_ini '
+                                 '(from ini file)*'])
     assert result.ret == 0
 
 
@@ -51,7 +52,7 @@ def test_settings():
             assert os.environ['DJANGO_SETTINGS_MODULE'] == 'tpkg.settings_env'
     """)
     result = testdir.runpytest_subprocess()
-    result.stdout.fnmatch_lines(['django settings: tpkg.settings_env (from '
+    result.stdout.fnmatch_lines(['Django settings: tpkg.settings_env (from '
                                  'environment variable)*'])
     assert result.parseoutcomes()['passed'] == 1
 
@@ -72,7 +73,8 @@ def test_ds():
             assert os.environ['DJANGO_SETTINGS_MODULE'] == 'tpkg.settings_opt'
     """)
     result = testdir.runpytest_subprocess('--ds=tpkg.settings_opt')
-    result.stdout.fnmatch_lines(['django settings: tpkg.settings_opt (from command line option)'])
+    result.stdout.fnmatch_lines(['Django settings: tpkg.settings_opt '
+                                 '(from command line option)'])
     assert result.parseoutcomes()['passed'] == 1