Merge pull request pytest-dev#799 from blueyed/minor

Minor improvements

Author: blueyed

pytest_django/fixtures.py

@@ -33,7 +33,7 @@
 
 
 @pytest.fixture(scope="session")
-def django_db_modify_db_settings_tox_suffix(request):
+def django_db_modify_db_settings_tox_suffix():
     skip_if_no_django()
 
     tox_environment = os.getenv("TOX_PARALLEL_ENV")

pytest_django/plugin.py

@@ -325,7 +325,7 @@ def _get_option_with_source(option, envname):
     _setup_django()
 
 
-def pytest_report_header(config):
+def pytest_report_header():
     if _report_header:
         return ["django: " + ", ".join(_report_header)]
 
@@ -415,7 +415,7 @@ def pytest_runtest_setup(item):
             _disable_class_methods(item.cls)
 
 
-def pytest_collection_modifyitems(session, config, items):
+def pytest_collection_modifyitems(items):
     def get_order_number(test):
         marker_db = test.get_closest_marker('django_db')
         if marker_db:
@@ -553,7 +553,7 @@ def _dj_autoclear_mailbox():
 
 
 @pytest.fixture(scope="function")
-def mailoutbox(monkeypatch, django_mail_patch_dns, _dj_autoclear_mailbox):
+def mailoutbox(django_mail_patch_dns, _dj_autoclear_mailbox):
     if not django_settings_is_configured():
         return
 
@@ -570,7 +570,7 @@ def django_mail_patch_dns(monkeypatch, django_mail_dnsname):
 
 
 @pytest.fixture(scope="function")
-def django_mail_dnsname(monkeypatch):
+def django_mail_dnsname():
     return "fake-tests.example.com"
 
 
@@ -605,7 +605,7 @@ def restore():
 
 
 @pytest.fixture(autouse=True, scope="session")
-def _fail_for_invalid_template_variable(request):
+def _fail_for_invalid_template_variable():
     """Fixture that fails for invalid variables in templates.
 
     This fixture will fail each test that uses django template rendering

tests/test_fixtures.py

@@ -417,13 +417,12 @@ def test_serve_static_with_staticfiles_app(self, django_testdir, settings):
         """
         django_testdir.create_test_module(
             """
-            import pytest
             from django.utils.encoding import force_str
 
             try:
-                from urllib2 import urlopen, HTTPError
+                from urllib2 import urlopen
             except ImportError:
-                from urllib.request import urlopen, HTTPError
+                from urllib.request import urlopen
 
             class TestLiveServer:
                 def test_a(self, live_server, settings):