1 files changed, 6 insertions, 7 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index cafc9d6e2..e9728cd09 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -34,7 +34,6 @@ from rest_framework.authtoken.models import Token
 from axes import models as axes_models
 from axes.admin import AccessAttemptAdmin, AccessLogAdmin
 from django.conf import settings
-from django.conf.urls import url
 from django.contrib import admin, messages
 from django.contrib.admin.views.main import ChangeList
 from django.contrib.auth.admin import GroupAdmin, UserAdmin
@@ -61,11 +60,11 @@ from django.db.models.fields.related import ForeignKey
 from django.forms import BaseInlineFormSet
 from django.http import HttpResponseRedirect, HttpResponse, Http404
 from django.shortcuts import render
-from django.urls import reverse
+from django.urls import re_path, reverse
 from django.utils.decorators import method_decorator
 from django.utils.text import slugify
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.decorators.csrf import csrf_protect
 
 from django import forms
@@ -1120,7 +1119,7 @@ class ImportActionAdmin(admin.ModelAdmin):
     def get_urls(self):
         urls = super(ImportActionAdmin, self).get_urls()
         my_urls = [
-            url(r"^import-from-csv/$", self.import_generic),
+            re_path(r"^import-from-csv/$", self.import_generic),
         ]
         return my_urls + urls
 
@@ -1278,7 +1277,7 @@ class ImportGEOJSONActionAdmin(object):
     def get_urls(self):
         urls = super(ImportGEOJSONActionAdmin, self).get_urls()
         my_urls = [
-            url(r"^import-from-geojson/$", self.import_geojson),
+            re_path(r"^import-from-geojson/$", self.import_geojson),
         ]
         return my_urls + urls
 
@@ -1504,7 +1503,7 @@ class ImportJSONActionAdmin(admin.ModelAdmin):
     def get_urls(self):
         urls = super(ImportJSONActionAdmin, self).get_urls()
         my_urls = [
-            url(r"^import-from-json/$", self.import_json),
+            re_path(r"^import-from-json/$", self.import_json),
         ]
         return my_urls + urls
 
@@ -1769,7 +1768,7 @@ class CreateDepartmentActionAdmin(GeneralTypeAdmin):
     def get_urls(self):
         urls = super(CreateDepartmentActionAdmin, self).get_urls()
         my_urls = [
-            url(r"^create-department/$", self.create_area),
+            re_path(r"^create-department/$", self.create_area),
         ]
         return my_urls + urls