Fix python namespacing
Use namespaces when referencing python packages. Also, as per https://review.opendev.org/#/c/527320/, replace all references to django.core.urlresolves with django.urls. Change-Id: I6460d0734aa11ffa44f259baa7155d2a202f7162
This commit is contained in:
parent
7358921b34
commit
4ad1cf5ca6
@ -13,7 +13,7 @@
|
||||
import os
|
||||
|
||||
from django.conf import settings
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.urls import reverse
|
||||
from django.utils.safestring import mark_safe
|
||||
|
||||
from gbpui import client
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
from horizon import forms
|
||||
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.urls import reverse
|
||||
|
||||
|
||||
class ReversingModalFormView(forms.ModalFormView):
|
||||
|
@ -12,7 +12,8 @@
|
||||
|
||||
from itertools import chain
|
||||
|
||||
from django.core import urlresolvers
|
||||
from django import urls
|
||||
|
||||
from django.forms import fields
|
||||
from django.forms import TextInput
|
||||
from django.forms import widgets
|
||||
@ -43,11 +44,11 @@ class DynamicMultiSelectWidget(widgets.SelectMultiple):
|
||||
return self.add_item_link()
|
||||
try:
|
||||
if self.add_item_link_args:
|
||||
return urlresolvers.reverse(self.add_item_link,
|
||||
return urls.reverse(self.add_item_link,
|
||||
args=self.add_item_link_args)
|
||||
else:
|
||||
return urlresolvers.reverse(self.add_item_link)
|
||||
except urlresolvers.NoReverseMatch:
|
||||
return urls.reverse(self.add_item_link)
|
||||
except urls.NoReverseMatch:
|
||||
return self.add_item_link
|
||||
|
||||
|
||||
@ -116,7 +117,7 @@ class TransferTableWidget(widgets.SelectMultiple):
|
||||
options = self.render_options(choices, selected)
|
||||
|
||||
if self.add_item_link is not None:
|
||||
final_attrs['add_item_link'] = urlresolvers.reverse(
|
||||
final_attrs['add_item_link'] = urls.reverse(
|
||||
self.add_item_link
|
||||
)
|
||||
|
||||
|
@ -10,9 +10,9 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django.core.urlresolvers import reverse
|
||||
from django import http
|
||||
from django.template.defaultfilters import filesizeformat # noqa
|
||||
from django.urls import reverse
|
||||
from django.utils import html
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.views.decorators.debug import sensitive_variables # noqa
|
||||
|
@ -10,7 +10,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
|
||||
|
||||
|
@ -10,7 +10,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 exceptions
|
||||
@ -19,7 +19,7 @@ from horizon import tabs
|
||||
from gbpui import client
|
||||
from gbpui import column_filters as gfilters
|
||||
|
||||
import tables
|
||||
from gbpui.panels.application_policy import tables
|
||||
|
||||
PolicyRulesTable = tables.PolicyRulesTable
|
||||
PolicyClassifiersTable = tables.PolicyClassifiersTable
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
from django.conf.urls import url # noqa
|
||||
|
||||
import views
|
||||
from gbpui.panels.application_policy import views
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^$', views.IndexView.as_view(), name='index'),
|
||||
|
@ -9,14 +9,15 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 horizon import tabs
|
||||
from horizon import workflows
|
||||
|
||||
import forms as policy_rule_set_forms
|
||||
import tabs as policy_rule_set_tabs
|
||||
import workflows as policy_rule_set_workflows
|
||||
from gbpui.panels.application_policy import forms as policy_rule_set_forms
|
||||
from gbpui.panels.application_policy import tabs as policy_rule_set_tabs
|
||||
from gbpui.panels.application_policy import workflows as prs_workflows
|
||||
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from gbpui.common import forms as gbforms
|
||||
@ -26,9 +27,9 @@ PolicyRuleSetDetailsTabs = policy_rule_set_tabs.PolicyRuleSetDetailsTabs
|
||||
PolicyRuleDetailsTabs = policy_rule_set_tabs.PolicyRuleDetailsTabs
|
||||
PolicyClassifierDetailsTabs = policy_rule_set_tabs.PolicyClassifierDetailsTabs
|
||||
PolicyActionDetailsTabs = policy_rule_set_tabs.PolicyActionDetailsTabs
|
||||
AddPolicyRuleSet = policy_rule_set_workflows.AddContract
|
||||
AddPolicyRule = policy_rule_set_workflows.AddPolicyRule
|
||||
AddPolicyClassifier = policy_rule_set_workflows.AddPolicyClassifier
|
||||
AddPolicyRuleSet = prs_workflows.AddContract
|
||||
AddPolicyRule = prs_workflows.AddPolicyRule
|
||||
AddPolicyClassifier = prs_workflows.AddPolicyClassifier
|
||||
|
||||
|
||||
class IndexView(tabs.TabbedTableView):
|
||||
|
@ -10,7 +10,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 import html
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
|
@ -12,9 +12,9 @@
|
||||
|
||||
import logging
|
||||
|
||||
from django.core.urlresolvers import reverse
|
||||
from django import http
|
||||
from django import shortcuts
|
||||
from django.urls import reverse
|
||||
from django.utils import html
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
|
@ -10,7 +10,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
|
||||
|
||||
|
@ -10,7 +10,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 exceptions
|
||||
@ -19,7 +19,7 @@ from horizon import tabs
|
||||
from gbpui import client
|
||||
from gbpui import column_filters as gfilters
|
||||
|
||||
import tables
|
||||
from gbpui.panels.network_policy import tables
|
||||
|
||||
|
||||
class L3PolicyDetailsTab(tabs.Tab):
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
from django.conf.urls import url # noqa
|
||||
|
||||
import views
|
||||
from gbpui.panels.network_policy import views
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^$', views.IndexView.as_view(), name='index'),
|
||||
|
@ -9,7 +9,8 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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
|
||||
@ -19,9 +20,9 @@ from horizon import tabs
|
||||
from gbpui import client
|
||||
from gbpui.common import forms as gbforms
|
||||
|
||||
import forms as np_forms
|
||||
import tables as np_tables
|
||||
import tabs as np_tabs
|
||||
from gbpui.panels.network_policy import forms as np_forms
|
||||
from gbpui.panels.network_policy import tables as np_tables
|
||||
from gbpui.panels.network_policy import tabs as np_tabs
|
||||
|
||||
|
||||
class IndexView(tabs.TabbedTableView):
|
||||
|
@ -13,7 +13,7 @@
|
||||
import json
|
||||
import logging
|
||||
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.urls import reverse
|
||||
from django.utils import html
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
|
@ -10,7 +10,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
|
||||
|
||||
|
@ -12,12 +12,12 @@
|
||||
|
||||
import json
|
||||
|
||||
import tables as ns_tables
|
||||
from gbpui.panels.network_services import tables as ns_tables
|
||||
|
||||
import yaml
|
||||
|
||||
from django.contrib.staticfiles.templatetags.staticfiles import static
|
||||
from django.core.urlresolvers import reverse_lazy
|
||||
from django.urls import reverse_lazy
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from horizon import exceptions
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
from django.conf.urls import url # noqa
|
||||
|
||||
import views
|
||||
from gbpui.panels.network_services import views
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^$', views.IndexView.as_view(), name='index'),
|
||||
|
@ -12,8 +12,8 @@
|
||||
from horizon import forms
|
||||
from horizon import tabs
|
||||
|
||||
import forms as ns_forms
|
||||
import tabs as ns_tabs
|
||||
from gbpui.panels.network_services import forms as ns_forms
|
||||
from gbpui.panels.network_services import tabs as ns_tabs
|
||||
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from gbpui.common import forms as gbforms
|
||||
|
@ -12,8 +12,8 @@
|
||||
|
||||
import logging
|
||||
|
||||
from django.core.urlresolvers import reverse
|
||||
from django import http
|
||||
from django.urls import reverse
|
||||
from django.utils import html
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
|
@ -11,9 +11,9 @@
|
||||
# under the License.
|
||||
import logging
|
||||
|
||||
from django.core.urlresolvers import reverse
|
||||
from django import http
|
||||
from django import shortcuts
|
||||
from django.urls import reverse
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.utils.translation import ungettext_lazy
|
||||
|
||||
|
@ -12,9 +12,9 @@
|
||||
|
||||
import time
|
||||
|
||||
import tables
|
||||
from gbpui.panels.policytargets import tables
|
||||
|
||||
from django.core.urlresolvers import reverse_lazy
|
||||
from django.urls import reverse_lazy
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from horizon import exceptions
|
||||
|
@ -12,9 +12,9 @@
|
||||
|
||||
from django.conf.urls import url # noqa
|
||||
|
||||
import views
|
||||
from gbpui.panels.policytargets import views
|
||||
|
||||
import restApi
|
||||
from gbpui.panels.policytargets import restApi
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^$',
|
||||
|
@ -12,8 +12,8 @@
|
||||
|
||||
import json
|
||||
|
||||
from django.core.urlresolvers import reverse_lazy
|
||||
from django.http import HttpResponse # noqa
|
||||
from django.urls import reverse_lazy
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from horizon import exceptions
|
||||
@ -25,9 +25,9 @@ from gbpui import client
|
||||
from gbpui.common import forms as gbforms
|
||||
|
||||
|
||||
import forms as policy_target_forms
|
||||
import tabs as policy_target_tabs
|
||||
import workflows as policy_target_workflows
|
||||
import gbpui.panels.policytargets.forms as policy_target_forms
|
||||
import gbpui.panels.policytargets.tabs as policy_target_tabs
|
||||
import gbpui.panels.policytargets.workflows as policy_target_workflows
|
||||
|
||||
from openstack_dashboard import api
|
||||
|
||||
|
@ -14,8 +14,8 @@ import logging
|
||||
import re
|
||||
|
||||
from django.conf import settings
|
||||
from django.core.urlresolvers import reverse
|
||||
from django import shortcuts
|
||||
from django.urls import reverse
|
||||
from django.utils import html
|
||||
from django.utils.text import normalize_newlines # noqa
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
@ -7,7 +7,7 @@
|
||||
# be installed in a specific order.
|
||||
#
|
||||
# Hacking should appear first in case something else depends on pep8
|
||||
hacking>=1.1.0,<2 # Apache-2.0
|
||||
hacking>=3.0.1,<3.1.0 # Apache-2.0
|
||||
# remove this pyflakes from here once you bump the
|
||||
# hacking to 3.2.0 or above. hacking 3.2.0 takes
|
||||
# care of pyflakes version compatibilty.
|
||||
|
Loading…
Reference in New Issue
Block a user