Merge "Upgrade app for Django >= 2.0 compatability"

adjutant_ui/content/email/views.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import forms

adjutant_ui/content/notifications/tables.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.core import urlresolvers
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 
@@ -56,8 +56,8 @@ class AcknowlegeNotifcation(tables.BatchAction):
 
 
 def get_task_link(datum):
-    return urlresolvers.reverse("horizon:management:tasks:detail",
-                                args=(datum.task,))
+    return reverse("horizon:management:tasks:detail",
+                   args=(datum.task,))
 
 
 class ErrorRow(tables.Row):

adjutant_ui/content/notifications/views.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

adjutant_ui/content/project_users/forms.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

adjutant_ui/content/project_users/views.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

adjutant_ui/content/quota/forms.py

@@ -14,7 +14,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

adjutant_ui/content/quota/views.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

adjutant_ui/content/signup/views.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from django.shortcuts import render
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 
 from horizon import forms
 

adjutant_ui/content/tasks/views.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

tox.ini

@@ -63,8 +63,8 @@ import_exceptions = collections.defaultdict,
                     django.conf.urls.include,
                     django.conf.urls.patterns,
                     django.conf.urls.url,
-                    django.core.urlresolvers.reverse,
-                    django.core.urlresolvers.reverse_lazy,
+                    django.urls.reverse,
+                    django.urls.reverse_lazy,
                     django.template.loader.render_to_string,
                     django.test.utils.override_settings,
                     django.utils.datastructures.SortedDict,