openstack
/
tacker-horizon
Code Issues Proposed changes

Dropping explicit unicode literal 

In python 3, all strings are considered as unicode string.

This patch drops the explicit unicode literal (u'...')
or (u"..") appearances from the unicode strings.

Change-Id: I50655850fe2d1baf34dee9938f35c92266ccab83
This commit is contained in:
Manpreet Kaur 2021-01-30 15:52:53 +05:30
parent aa79455735
commit 70566f4861
8 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/source/conf.py
View File

@ -37,7 +37,7 @@ source_suffix = '.rst'
master_doc = 'index' master_doc = 'index'
# General information about the project. # General information about the project.
copyright = u'2018, OpenStack Developers' copyright = '2018, OpenStack Developers'
# openstackdocstheme options # openstackdocstheme options
openstackdocs_repo_name = 'openstack/tacker-horizon' openstackdocs_repo_name = 'openstack/tacker-horizon'
@ -75,15 +75,15 @@ htmlhelp_basename = 'tacker-horizon'
latex_documents = [ latex_documents = [
('index', ('index',
'doc-tacker-horizon.tex', 'doc-tacker-horizon.tex',
u'Tacker-Horizon Documentation', 'Tacker-Horizon Documentation',
u'OpenStack Developers', 'howto', True), 'OpenStack Developers', 'howto', True),
] ]
man_pages = [ man_pages = [
('index', u'Tacker Horizon Documentation', ('index', 'Tacker Horizon Documentation',
'Documentation for Tacker Horizon plugin to Openstack\ 'Documentation for Tacker Horizon plugin to Openstack\
Dashboard (Horizon)', Dashboard (Horizon)',
[u'OpenStack'], 1) ['OpenStack'], 1)
] ]
# Example configuration for intersphinx: refer to the Python standard library. # Example configuration for intersphinx: refer to the Python standard library.

8
tacker_horizon/openstack_dashboard/dashboards/nfv/nscatalog/tables.py
View File

@ -28,16 +28,16 @@ class DeleteNSD(policy.PolicyTargetMixin, tables.DeleteAction):
@staticmethod @staticmethod
def action_present(count): def action_present(count):
return ungettext_lazy( return ungettext_lazy(
u"Delete NS", "Delete NS",
u"Delete NSs", "Delete NSs",
count count
) )
@staticmethod @staticmethod
def action_past(count): def action_past(count):
return ungettext_lazy( return ungettext_lazy(
u"Delete NS", "Delete NS",
u"Delete NSs", "Delete NSs",
count count
) )

8
tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/tables.py
View File

@ -109,16 +109,16 @@ class DeleteNS(policy.PolicyTargetMixin, tables.DeleteAction):
@staticmethod @staticmethod
def action_present(count): def action_present(count):
return ungettext_lazy( return ungettext_lazy(
u"Terminate NS", "Terminate NS",
u"Terminate NSs", "Terminate NSs",
count count
) )
@staticmethod @staticmethod
def action_past(count): def action_past(count):
return ungettext_lazy( return ungettext_lazy(
u"Terminate NS", "Terminate NS",
u"Terminate NSs", "Terminate NSs",
count count
) )

8
tacker_horizon/openstack_dashboard/dashboards/nfv/vim/tables.py
View File

@ -30,16 +30,16 @@ class DeleteVIMLink(policy.PolicyTargetMixin, tables.DeleteAction):
@staticmethod @staticmethod
def action_present(count): def action_present(count):
return ungettext_lazy( return ungettext_lazy(
u"Delete VIM", "Delete VIM",
u"Delete VIMs", "Delete VIMs",
count count
) )
@staticmethod @staticmethod
def action_past(count): def action_past(count):
return ungettext_lazy( return ungettext_lazy(
u"Delete VIM", "Delete VIM",
u"Delete VIMs", "Delete VIMs",
count count
) )

8
tacker_horizon/openstack_dashboard/dashboards/nfv/vnfcatalog/tables.py
View File

@ -30,16 +30,16 @@ class DeleteVNFD(policy.PolicyTargetMixin, tables.DeleteAction):
@staticmethod @staticmethod
def action_present(count): def action_present(count):
return ungettext_lazy( return ungettext_lazy(
u"Delete VNF", "Delete VNF",
u"Delete VNFs", "Delete VNFs",
count count
) )
@staticmethod @staticmethod
def action_past(count): def action_past(count):
return ungettext_lazy( return ungettext_lazy(
u"Delete VNF", "Delete VNF",
u"Delete VNFs", "Delete VNFs",
count count
) )

8
tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgcatalog/tables.py
View File

@ -28,16 +28,16 @@ class DeleteVNFFGD(policy.PolicyTargetMixin, tables.DeleteAction):
@staticmethod @staticmethod
def action_present(count): def action_present(count):
return ungettext_lazy( return ungettext_lazy(
u"Delete VNFFG", "Delete VNFFG",
u"Delete VNFFGs", "Delete VNFFGs",
count count
) )
@staticmethod @staticmethod
def action_past(count): def action_past(count):
return ungettext_lazy( return ungettext_lazy(
u"Delete VNFFG", "Delete VNFFG",
u"Delete VNFFGs", "Delete VNFFGs",
count count
) )

68
tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/tables.py
View File

@ -98,16 +98,16 @@ class DeleteVNFFG(policy.PolicyTargetMixin, tables.DeleteAction):
@staticmethod @staticmethod
def action_present(count): def action_present(count):
return ungettext_lazy( return ungettext_lazy(
u"Terminate VNFFG", "Terminate VNFFG",
u"Terminate VNFFGs", "Terminate VNFFGs",
count count
) )
@staticmethod @staticmethod
def action_past(count): def action_past(count):
return ungettext_lazy( return ungettext_lazy(
u"Terminate VNFFG", "Terminate VNFFG",
u"Terminate VNFFGs", "Terminate VNFFGs",
count count
) )
@ -130,65 +130,65 @@ class VNFFGManagerTable(tables.DataTable):
) )
STACK_STATUS_DISPLAY_CHOICES = ( STACK_STATUS_DISPLAY_CHOICES = (
("init_in_progress", pgettext_lazy("current status of stack", ("init_in_progress", pgettext_lazy("current status of stack",
u"Init In Progress")), "Init In Progress")),
("init_complete", pgettext_lazy("current status of stack", ("init_complete", pgettext_lazy("current status of stack",
u"Init Complete")), "Init Complete")),
("init_failed", pgettext_lazy("current status of stack", ("init_failed", pgettext_lazy("current status of stack",
u"Init Failed")), "Init Failed")),
("create_in_progress", pgettext_lazy("current status of stack", ("create_in_progress", pgettext_lazy("current status of stack",
u"Create In Progress")), "Create In Progress")),
("create_complete", pgettext_lazy("current status of stack", ("create_complete", pgettext_lazy("current status of stack",
u"Create Complete")), "Create Complete")),
("create_failed", pgettext_lazy("current status of stack", ("create_failed", pgettext_lazy("current status of stack",
u"Create Failed")), "Create Failed")),
("delete_in_progress", pgettext_lazy("current status of stack", ("delete_in_progress", pgettext_lazy("current status of stack",
u"Delete In Progress")), "Delete In Progress")),
("delete_complete", pgettext_lazy("current status of stack", ("delete_complete", pgettext_lazy("current status of stack",
u"Delete Complete")), "Delete Complete")),
("delete_failed", pgettext_lazy("current status of stack", ("delete_failed", pgettext_lazy("current status of stack",
u"Delete Failed")), "Delete Failed")),
("update_in_progress", pgettext_lazy("current status of stack", ("update_in_progress", pgettext_lazy("current status of stack",
u"Update In Progress")), "Update In Progress")),
("update_complete", pgettext_lazy("current status of stack", ("update_complete", pgettext_lazy("current status of stack",
u"Update Complete")), "Update Complete")),
("update_failed", pgettext_lazy("current status of stack", ("update_failed", pgettext_lazy("current status of stack",
u"Update Failed")), "Update Failed")),
("rollback_in_progress", pgettext_lazy("current status of stack", ("rollback_in_progress", pgettext_lazy("current status of stack",
u"Rollback In Progress")), "Rollback In Progress")),
("rollback_complete", pgettext_lazy("current status of stack", ("rollback_complete", pgettext_lazy("current status of stack",
u"Rollback Complete")), "Rollback Complete")),
("rollback_failed", pgettext_lazy("current status of stack", ("rollback_failed", pgettext_lazy("current status of stack",
u"Rollback Failed")), "Rollback Failed")),
("suspend_in_progress", pgettext_lazy("current status of stack", ("suspend_in_progress", pgettext_lazy("current status of stack",
u"Suspend In Progress")), "Suspend In Progress")),
("suspend_complete", pgettext_lazy("current status of stack", ("suspend_complete", pgettext_lazy("current status of stack",
u"Suspend Complete")), "Suspend Complete")),
("suspend_failed", pgettext_lazy("current status of stack", ("suspend_failed", pgettext_lazy("current status of stack",
u"Suspend Failed")), "Suspend Failed")),
("resume_in_progress", pgettext_lazy("current status of stack", ("resume_in_progress", pgettext_lazy("current status of stack",
u"Resume In Progress")), "Resume In Progress")),
("resume_complete", pgettext_lazy("current status of stack", ("resume_complete", pgettext_lazy("current status of stack",
u"Resume Complete")), "Resume Complete")),
("resume_failed", pgettext_lazy("current status of stack", ("resume_failed", pgettext_lazy("current status of stack",
u"Resume Failed")), "Resume Failed")),
("adopt_in_progress", pgettext_lazy("current status of stack", ("adopt_in_progress", pgettext_lazy("current status of stack",
u"Adopt In Progress")), "Adopt In Progress")),
("adopt_complete", pgettext_lazy("current status of stack", ("adopt_complete", pgettext_lazy("current status of stack",
u"Adopt Complete")), "Adopt Complete")),
("adopt_failed", pgettext_lazy("current status of stack", ("adopt_failed", pgettext_lazy("current status of stack",
u"Adopt Failed")), "Adopt Failed")),
("snapshot_in_progress", pgettext_lazy("current status of stack", ("snapshot_in_progress", pgettext_lazy("current status of stack",
u"Snapshot In Progress")), "Snapshot In Progress")),
("snapshot_complete", pgettext_lazy("current status of stack", ("snapshot_complete", pgettext_lazy("current status of stack",
u"Snapshot Complete")), "Snapshot Complete")),
("snapshot_failed", pgettext_lazy("current status of stack", ("snapshot_failed", pgettext_lazy("current status of stack",
u"Snapshot Failed")), "Snapshot Failed")),
("check_in_progress", pgettext_lazy("current status of stack", ("check_in_progress", pgettext_lazy("current status of stack",
u"Check In Progress")), "Check In Progress")),
("check_complete", pgettext_lazy("current status of stack", ("check_complete", pgettext_lazy("current status of stack",
u"Check Complete")), "Check Complete")),
("check_failed", pgettext_lazy("current status of stack", ("check_failed", pgettext_lazy("current status of stack",
u"Check Failed")), "Check Failed")),
) )
name = tables.Column("name", name = tables.Column("name",
link="horizon:nfv:vnffgmanager:detail", link="horizon:nfv:vnffgmanager:detail",

68
tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/tables.py
View File

@ -143,16 +143,16 @@ class DeleteVNF(policy.PolicyTargetMixin, tables.DeleteAction):
@staticmethod @staticmethod
def action_present(count): def action_present(count):
return ungettext_lazy( return ungettext_lazy(
u"Terminate VNF", "Terminate VNF",
u"Terminate VNFs", "Terminate VNFs",
count count
) )
@staticmethod @staticmethod
def action_past(count): def action_past(count):
return ungettext_lazy( return ungettext_lazy(
u"Terminate VNF", "Terminate VNF",
u"Terminate VNFs", "Terminate VNFs",
count count
) )
@ -175,65 +175,65 @@ class VNFManagerTable(tables.DataTable):
) )
STACK_STATUS_DISPLAY_CHOICES = ( STACK_STATUS_DISPLAY_CHOICES = (
("init_in_progress", pgettext_lazy("current status of stack", ("init_in_progress", pgettext_lazy("current status of stack",
u"Init In Progress")), "Init In Progress")),
("init_complete", pgettext_lazy("current status of stack", ("init_complete", pgettext_lazy("current status of stack",
u"Init Complete")), "Init Complete")),
("init_failed", pgettext_lazy("current status of stack", ("init_failed", pgettext_lazy("current status of stack",
u"Init Failed")), "Init Failed")),
("create_in_progress", pgettext_lazy("current status of stack", ("create_in_progress", pgettext_lazy("current status of stack",
u"Create In Progress")), "Create In Progress")),
("create_complete", pgettext_lazy("current status of stack", ("create_complete", pgettext_lazy("current status of stack",
u"Create Complete")), "Create Complete")),
("create_failed", pgettext_lazy("current status of stack", ("create_failed", pgettext_lazy("current status of stack",
u"Create Failed")), "Create Failed")),
("delete_in_progress", pgettext_lazy("current status of stack", ("delete_in_progress", pgettext_lazy("current status of stack",
u"Delete In Progress")), "Delete In Progress")),
("delete_complete", pgettext_lazy("current status of stack", ("delete_complete", pgettext_lazy("current status of stack",
u"Delete Complete")), "Delete Complete")),
("delete_failed", pgettext_lazy("current status of stack", ("delete_failed", pgettext_lazy("current status of stack",
u"Delete Failed")), "Delete Failed")),
("update_in_progress", pgettext_lazy("current status of stack", ("update_in_progress", pgettext_lazy("current status of stack",
u"Update In Progress")), "Update In Progress")),
("update_complete", pgettext_lazy("current status of stack", ("update_complete", pgettext_lazy("current status of stack",
u"Update Complete")), "Update Complete")),
("update_failed", pgettext_lazy("current status of stack", ("update_failed", pgettext_lazy("current status of stack",
u"Update Failed")), "Update Failed")),
("rollback_in_progress", pgettext_lazy("current status of stack", ("rollback_in_progress", pgettext_lazy("current status of stack",
u"Rollback In Progress")), "Rollback In Progress")),
("rollback_complete", pgettext_lazy("current status of stack", ("rollback_complete", pgettext_lazy("current status of stack",
u"Rollback Complete")), "Rollback Complete")),
("rollback_failed", pgettext_lazy("current status of stack", ("rollback_failed", pgettext_lazy("current status of stack",
u"Rollback Failed")), "Rollback Failed")),
("suspend_in_progress", pgettext_lazy("current status of stack", ("suspend_in_progress", pgettext_lazy("current status of stack",
u"Suspend In Progress")), "Suspend In Progress")),
("suspend_complete", pgettext_lazy("current status of stack", ("suspend_complete", pgettext_lazy("current status of stack",
u"Suspend Complete")), "Suspend Complete")),
("suspend_failed", pgettext_lazy("current status of stack", ("suspend_failed", pgettext_lazy("current status of stack",
u"Suspend Failed")), "Suspend Failed")),
("resume_in_progress", pgettext_lazy("current status of stack", ("resume_in_progress", pgettext_lazy("current status of stack",
u"Resume In Progress")), "Resume In Progress")),
("resume_complete", pgettext_lazy("current status of stack", ("resume_complete", pgettext_lazy("current status of stack",
u"Resume Complete")), "Resume Complete")),
("resume_failed", pgettext_lazy("current status of stack", ("resume_failed", pgettext_lazy("current status of stack",
u"Resume Failed")), "Resume Failed")),
("adopt_in_progress", pgettext_lazy("current status of stack", ("adopt_in_progress", pgettext_lazy("current status of stack",
u"Adopt In Progress")), "Adopt In Progress")),
("adopt_complete", pgettext_lazy("current status of stack", ("adopt_complete", pgettext_lazy("current status of stack",
u"Adopt Complete")), "Adopt Complete")),
("adopt_failed", pgettext_lazy("current status of stack", ("adopt_failed", pgettext_lazy("current status of stack",
u"Adopt Failed")), "Adopt Failed")),
("snapshot_in_progress", pgettext_lazy("current status of stack", ("snapshot_in_progress", pgettext_lazy("current status of stack",
u"Snapshot In Progress")), "Snapshot In Progress")),
("snapshot_complete", pgettext_lazy("current status of stack", ("snapshot_complete", pgettext_lazy("current status of stack",
u"Snapshot Complete")), "Snapshot Complete")),
("snapshot_failed", pgettext_lazy("current status of stack", ("snapshot_failed", pgettext_lazy("current status of stack",
u"Snapshot Failed")), "Snapshot Failed")),
("check_in_progress", pgettext_lazy("current status of stack", ("check_in_progress", pgettext_lazy("current status of stack",
u"Check In Progress")), "Check In Progress")),
("check_complete", pgettext_lazy("current status of stack", ("check_complete", pgettext_lazy("current status of stack",
u"Check Complete")), "Check Complete")),
("check_failed", pgettext_lazy("current status of stack", ("check_failed", pgettext_lazy("current status of stack",
u"Check Failed")), "Check Failed")),
) )
name = tables.Column("name", name = tables.Column("name",
link="horizon:nfv:vnfmanager:detail", link="horizon:nfv:vnfmanager:detail",