Skip to content

Commit 07c936d

Browse files
jpictimb07
authored andcommitted
Django 2.0 ImportError fix (#518)
1 parent 216fb71 commit 07c936d

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

pytest_django/plugin.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,11 @@ def _django_set_urlconf(request):
487487
if marker:
488488
skip_if_no_django()
489489
import django.conf
490-
from django.core.urlresolvers import clear_url_caches, set_urlconf
490+
try:
491+
from django.urls import clear_url_caches, set_urlconf
492+
except ImportError:
493+
# Removed in Django 2.0
494+
from django.core.urlresolvers import clear_url_caches, set_urlconf
491495

492496
validate_urls(marker)
493497
original_urlconf = django.conf.settings.ROOT_URLCONF

0 commit comments

Comments
 (0)