Merge "Django 2.0 support"

masakaridashboard/hosts/forms.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

masakaridashboard/hosts/tables.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 django.utils.translation import ungettext_lazy
 

masakaridashboard/hosts/tests.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 import mock
 
 from masakaridashboard.test import helpers as test

masakaridashboard/hosts/views.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 from django.conf import settings
-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

masakaridashboard/notifications/tests.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
 from django.test.utils import override_settings
+from django.urls import reverse
 from django.utils.http import urlunquote
 import mock
 

masakaridashboard/notifications/views.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

masakaridashboard/segments/forms.py

@@ -13,7 +13,7 @@
 #    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

masakaridashboard/segments/tables.py

@@ -13,7 +13,7 @@
 #    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 django.utils.translation import ungettext_lazy
 

masakaridashboard/segments/tests.py

@@ -16,8 +16,8 @@
 import mock
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
 from django.test.utils import override_settings
+from django.urls import reverse
 from django.utils.http import urlunquote
 from openstack_dashboard.test import helpers
 

masakaridashboard/segments/views.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from django.conf import settings
-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 tables

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py35,py27,py27dj18,pep8
+envlist = py35,py27,pep8
 minversion = 2.0
 skipsdist = True
 
@@ -32,12 +32,6 @@ commands =
   coverage xml --omit '.tox/cover/*' -o 'cover/coverage.xml'
   coverage html --omit '.tox/cover/*' -d 'cover/htmlcov'
 
-[testenv:py27dj18]
-basepython = python2.7
-commands =
-    pip install django>=1.8,<1.9
-    {[testenv]commands}
-
 [testenv:eslint]
 whitelist_externals = npm
 commands =