diff --git a/doc/source/conf.py b/doc/source/conf.py index 74120628..79d5b809 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -74,8 +74,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'Magnum UI' -copyright = u'2015, Cisco Systems, Inc.' +project = 'Magnum UI' +copyright = '2015, Cisco Systems, Inc.' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -230,8 +230,8 @@ latex_use_xindy = False # (source start file, target name, title, author, documentclass # [howto/manual]). latex_documents = [ - ('index', 'doc-magnum-ui.tex', u'Magnum UI Documentation', - u'OpenStack Foundation', 'howto', True), + ('index', 'doc-magnum-ui.tex', 'Magnum UI Documentation', + 'OpenStack Foundation', 'howto', True), ] # The name of an image file (relative to this directory) to place at the top of @@ -260,10 +260,10 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', u'Magnum UI Documentation', + ('index', 'Magnum UI Documentation', 'Documentation for the Magnum UI plugin to the Openstack\ Dashboard (Horizon)', - [u'OpenStack'], 1) + ['OpenStack'], 1) ] # If true, show URL addresses after external links. @@ -276,7 +276,7 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'Horizon', u'Horizon Documentation', u'OpenStack', + ('index', 'Horizon', 'Horizon Documentation', 'OpenStack', 'Horizon', 'One line description of project.', 'Miscellaneous'), ] @@ -293,10 +293,10 @@ texinfo_documents = [ # -- Options for Epub output -------------------------------------------------- # Bibliographic Dublin Core info. -epub_title = u'Horizon' -epub_author = u'OpenStack' -epub_publisher = u'OpenStack' -epub_copyright = u'2012, OpenStack' +epub_title = 'Horizon' +epub_author = 'OpenStack' +epub_publisher = 'OpenStack' +epub_copyright = '2012, OpenStack' # The language of the text. It defaults to the language option # or en if the language is not set. diff --git a/magnum_ui/test/api_tests/test_rest_api.py b/magnum_ui/test/api_tests/test_rest_api.py index 5e602c10..292f4840 100644 --- a/magnum_ui/test/api_tests/test_rest_api.py +++ b/magnum_ui/test/api_tests/test_rest_api.py @@ -66,7 +66,7 @@ class MagnumRestTestCase(test.RestAPITestCase): self.assertStatusCode(response, 204) client.cluster_template_delete.assert_called_once_with( request, - u'cluster_template_id') + 'cluster_template_id') # Clusters @mock.patch.object(magnum, 'magnum') @@ -105,7 +105,7 @@ class MagnumRestTestCase(test.RestAPITestCase): self.assertStatusCode(response, 204) client.cluster_delete.assert_called_once_with( request, - u'cluster_id') + 'cluster_id') # Certificates @mock.patch.object(magnum, 'magnum') diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 7e47b547..d18cab90 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -52,8 +52,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'Magnum UI Release Notes' -copyright = u'2016, Magnum UI Developers' +project = 'Magnum UI Release Notes' +copyright = '2016, Magnum UI Developers' # Release notes are version independent # The full version, including alpha/beta/rc tags. @@ -205,8 +205,8 @@ latex_elements = { # author, documentclass [howto, manual, or own class]). latex_documents = [ ('index', 'MagnumUIReleaseNotes.tex', - u'Magnum UI Release Notes Documentation', - u'Magnum UI Developers', 'manual'), + 'Magnum UI Release Notes Documentation', + 'Magnum UI Developers', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -236,8 +236,8 @@ latex_documents = [ # (source start file, name, description, authors, manual section). man_pages = [ ('index', 'MagnumUIReleaseNotes', - u'Magnum UI Release Notes Documentation', - [u'Magnum UI Developers'], 1) + 'Magnum UI Release Notes Documentation', + ['Magnum UI Developers'], 1) ] # If true, show URL addresses after external links. @@ -251,8 +251,8 @@ man_pages = [ # dir menu entry, description, category) texinfo_documents = [ ('index', 'MagnumUIReleaseNotes', - u'Magnum UI Release Notes Documentation', - u'Magnum UI Developers', 'MagnumUIReleaseNotes', + 'Magnum UI Release Notes Documentation', + 'Magnum UI Developers', 'MagnumUIReleaseNotes', 'User Interface for Magnum.', 'Miscellaneous'), ]