Merge branch 'master' into develop

2017-12-28 09:32:14 -05:00 · 2017-12-28 09:32:14 -05:00 · 31b49ab2f6
commit 31b49ab2f6
parent 3ccd6c8dc8 aa63e8f299
1 changed files with 5 additions and 1 deletions
--- a/helpdesk/tests/helpers.py
+++ b/helpdesk/tests/helpers.py
@ -22,7 +22,11 @@ def get_staff_user(username='helpdesk.staff', password='password'):

 def reload_urlconf(urlconf=None):

-    from importlib import reload  # python 3 needs this import.
+    from django.utils import six
+    if six.PY2:
+        from imp import reload
+    else:
+        from importlib import reload

    if urlconf is None:
        from django.conf import settings