From 745dc798f1516bec3b0e2e4f4592486a778513e4 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Thu, 21 Dec 2017 13:18:08 -0500 Subject: [PATCH] Remove 'django.setup()' compat import --- tests/conftest.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 06117fa28..69abe44c8 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,3 +1,6 @@ +import django + + def pytest_configure(): from django.conf import settings @@ -61,8 +64,4 @@ def pytest_configure(): 'guardian', ) - try: - import django - django.setup() - except AttributeError: - pass + django.setup()