Remove pytest_compat now that the requirement is 3.6+ (#616)

Author: blueyed

pytest_django/fixtures.py

@@ -11,7 +11,6 @@
 from . import live_server_helper
 
 from .django_compat import is_django_unittest
-from .pytest_compat import getfixturevalue
 
 from .lazy_django import skip_if_no_django
 
@@ -155,7 +154,7 @@ def db(request, django_db_setup, django_db_blocker):
     """
     if 'transactional_db' in request.funcargnames \
             or 'live_server' in request.funcargnames:
-        getfixturevalue(request, 'transactional_db')
+        request.getfixturevalue('transactional_db')
     else:
         _django_db_fixture_helper(False, request, django_db_blocker)
 
@@ -346,9 +345,9 @@ def _live_server_helper(request):
     if 'live_server' not in request.funcargnames:
         return
 
-    getfixturevalue(request, 'transactional_db')
+    request.getfixturevalue('transactional_db')
 
-    live_server = getfixturevalue(request, 'live_server')
+    live_server = request.getfixturevalue('live_server')
     live_server._live_server_modified_settings.enable()
     request.addfinalizer(live_server._live_server_modified_settings.disable)
 

pytest_django/plugin.py

@@ -33,7 +33,6 @@
 from .fixtures import rf  # noqa
 from .fixtures import settings  # noqa
 from .fixtures import transactional_db  # noqa
-from .pytest_compat import getfixturevalue
 
 from .lazy_django import django_settings_is_configured, skip_if_no_django
 
@@ -386,17 +385,17 @@ def _django_db_marker(request):
     if marker:
         transaction = validate_django_db(marker)
         if transaction:
-            getfixturevalue(request, 'transactional_db')
+            request.getfixturevalue('transactional_db')
         else:
-            getfixturevalue(request, 'db')
+            request.getfixturevalue('db')
 
 
 @pytest.fixture(autouse=True, scope='class')
 def _django_setup_unittest(request, django_db_blocker):
     """Setup a django unittest, internal to pytest-django."""
     if django_settings_is_configured() and is_django_unittest(request):
-        getfixturevalue(request, 'django_test_environment')
-        getfixturevalue(request, 'django_db_setup')
+        request.getfixturevalue('django_test_environment')
+        request.getfixturevalue('django_db_setup')
 
         django_db_blocker.unblock()
 

pytest_django/pytest_compat.py

@@ -4,7 +4,6 @@
 from django.db import connection
 from django.test.testcases import connections_support_transactions
 
-from pytest_django.pytest_compat import getfixturevalue
 from pytest_django_test.app.models import Item
 
 
@@ -34,9 +33,9 @@ class TestDatabaseFixtures:
     @pytest.fixture(params=['db', 'transactional_db'])
     def both_dbs(self, request):
         if request.param == 'transactional_db':
-            return getfixturevalue(request, 'transactional_db')
+            return request.getfixturevalue('transactional_db')
         elif request.param == 'db':
-            return getfixturevalue(request, 'db')
+            return request.getfixturevalue('db')
 
     def test_access(self, both_dbs):
         Item.objects.create(name='spam')