Merge "Fixed importError urlresolvers"

disaster_recovery/actions/tables.py

@@ -17,7 +17,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 
 from horizon import tables
-from horizon.utils.urlresolvers import reverse
+from django.core.urlresolvers import reverse
 
 import disaster_recovery.api.api as freezer_api
 

disaster_recovery/clients/tables.py

@@ -16,7 +16,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 
 from horizon import tables
-from horizon.utils.urlresolvers import reverse
+from django.core.urlresolvers import reverse
 
 import disaster_recovery.api.api as freezer_api
 

disaster_recovery/jobs/tables.py

@@ -20,7 +20,7 @@ from django.utils.translation import ungettext_lazy
 
 from horizon import tables
 from horizon import messages
-from horizon.utils.urlresolvers import reverse
+from django.core.urlresolvers import reverse
 
 import disaster_recovery.api.api as freezer_api
 

disaster_recovery/sessions/tables.py

@@ -19,7 +19,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 
 from horizon import tables
-from horizon.utils.urlresolvers import reverse
+from django.core.urlresolvers import reverse
 
 import disaster_recovery.api.api as freezer_api
 

disaster_recovery/sessions/workflows/attach.py

@@ -15,7 +15,7 @@
 import logging
 
 from django.utils.translation import ugettext_lazy as _
-from horizon.utils.urlresolvers import reverse
+from django.core.urlresolvers import reverse
 
 from horizon import exceptions
 from horizon import forms

disaster_recovery/sessions/workflows/create.py

@@ -16,7 +16,7 @@ import datetime
 import logging
 
 from django.utils.translation import ugettext_lazy as _
-from horizon.utils.urlresolvers import reverse
+from django.core.urlresolvers import reverse
 
 from horizon import exceptions
 from horizon import forms

tests/rest_api_tests.py

@@ -15,7 +15,7 @@
 import json
 from mock import patch
 
-from horizon.utils.urlresolvers import reverse
+from django.core.urlresolvers import reverse
 import openstack_dashboard.test.helpers as helpers