Avoid deprecation warnings on pytest 3.0

[mdentremont]

• Use getfixturevalue instead of getfuncargvalue if it exists

[mdentremont]

Unfortunately I've addressed the warnings by using duplicated try/except blocks - it might be nice to extract a helper function to avoid the duplication, similar to pytest-bdd https://github.com/pytest-dev/pytest-bdd/blob/30076d478c34afc67c41460a2956b430f15e7f90/pytest_bdd/utils.py#L26

I didn't see any other extracted functions in the codebase, so didn't want to break any patterns.

Let me know if you have any suggestions!

[rpkilby]

A compat module already exists - it seems like would be appropriate there.

# compat.py
def getfixturevalue(request, value):
    try:
        return request.getfixturevalue(value)
    except AttributeError:
        return request.getfuncargvalue(value)

# fixtures.py
from compat import getfixturevalue
...

getfixturevalue('transactional_db')

[mdentremont]

@rpkilby Thanks, done!

[blueyed]

What warning were you seeing?

[blueyed]

That should not be in here.

[mdentremont]

Oops - deleted

[mdentremont]

I added it to the .gitignore as it seems to be generated when I try to run the tests

[blueyed]

What warning were you seeing?

Sorry, apparently I only saw the last commit(s) when reviewing.

[mdentremont]

@blueyed Any ideas why the builds are failing on me?

[blueyed]

@mdentremont
You should not import the .compat module at module level (because that also does Django imports).

 pytest_django/plugin.py | 3 ++-
 tests/test_database.py  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git i/pytest_django/plugin.py w/pytest_django/plugin.py
index ef0fbcd..d464d7d 100644
--- i/pytest_django/plugin.py
+++ w/pytest_django/plugin.py
@@ -14,7 +14,6 @@
 import py
 import pytest

-from .compat import getfixturevalue
 from .django_compat import is_django_unittest  # noqa
 from .fixtures import django_db_setup  # noqa
 from .fixtures import django_db_use_migrations  # noqa
@@ -369,6 +368,7 @@ def _django_db_marker(request):
     """
     marker = request.keywords.get('django_db', None)
     if marker:
+        from .compat import getfixturevalue
         validate_django_db(marker)
         if marker.transaction:
             getfixturevalue(request, 'transactional_db')
@@ -380,6 +380,7 @@ def _django_db_marker(request):
 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):
+        from .compat import getfixturevalue
         getfixturevalue(request, 'django_test_environment')
         getfixturevalue(request, 'django_db_setup')

diff --git i/tests/test_database.py w/tests/test_database.py
index 06ba392..cb009d0 100644
--- i/tests/test_database.py
+++ w/tests/test_database.py
@@ -4,7 +4,6 @@
 from django.db import connection
 from django.test.testcases import connections_support_transactions

-from pytest_django.compat import getfixturevalue
 from pytest_django_test.app.models import Item


@@ -33,6 +32,7 @@ class TestDatabaseFixtures:

     @pytest.fixture(params=['db', 'transactional_db'])
     def both_dbs(self, request):
+        from pytest_django.compat import getfixturevalue
         if request.param == 'transactional_db':
             return getfixturevalue(request, 'transactional_db')
         elif request.param == 'db':

[blueyed]

Oh, there might hide some AttributeError in getting the fixture.

Better:

try:
    f = request.getfixturevalue
except AttributeError:
    return request.getfuncargvalue(value)
return f(value)

[mdentremont]

Ah good catch!

[mdentremont]

If we're going down this route - might as well just use a hasattr?

[blueyed]

See my comment above.

[mdentremont]

@blueyed - Oh man, finally realizing why this isn't working: we're importing from compat in some cases, before we try pulling in the DB fixture. This is problematic as I think the DB fixtures are loaded in before Django has gotten a chance to setup.

[mdentremont]

@blueyed It took awhile - but I finally got this thing to build 😛

[pelme]

Thanks for the fix, reviews and the persistence to get this working! :)