Skip to content

Commit 483e8c2

Browse files
committed
Replaced django.core.urlresolvers with django.urls (Django 2.0).
1 parent dce6d52 commit 483e8c2

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

recurrence/forms.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
from django import forms
22
from django.conf import settings
3-
from django.core import urlresolvers
43
from django.views import i18n
54
from django.utils import safestring
65
from django.utils.translation import ugettext_lazy as _, get_language
76
from django.contrib.staticfiles.storage import staticfiles_storage
87

8+
try:
9+
from django import urls
10+
except ImportError:
11+
from django.core import urlresolvers as urls
12+
913
import recurrence
1014
from recurrence import exceptions
1115

@@ -205,9 +209,9 @@ def find_recurrence_i18n_js_catalog():
205209

206210
# first try to use the dynamic form of the javascript_catalog view
207211
try:
208-
return urlresolvers.reverse(
212+
return urls.reverse(
209213
i18n.javascript_catalog, kwargs={'packages': 'recurrence'})
210-
except urlresolvers.NoReverseMatch:
214+
except urls.NoReverseMatch:
211215
pass
212216

213217
# then scan the entire urlconf for a javascript_catalague pattern
@@ -221,9 +225,9 @@ def check_urlpatterns(urlpatterns):
221225
elif (pattern.callback == i18n.javascript_catalog and
222226
'recurrence' in pattern.default_args.get('packages', [])):
223227
if pattern.name:
224-
return urlresolvers.reverse(pattern.name)
228+
return urls.reverse(pattern.name)
225229
else:
226-
return urlresolvers.reverse(pattern.callback)
230+
return urls.reverse(pattern.callback)
227231

228232
root_urlconf = __import__(settings.ROOT_URLCONF, {}, {}, [''])
229233
url = check_urlpatterns(root_urlconf.urlpatterns)

0 commit comments

Comments
 (0)