diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py index aa00aaa1f..6989eff66 100644 --- a/api-ref/source/conf.py +++ b/api-ref/source/conf.py @@ -45,8 +45,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'Placement API Reference' -copyright = u'2010-present, OpenStack Foundation' +project = 'Placement API Reference' +copyright = '2010-present, OpenStack Foundation' # openstackdocstheme options openstackdocs_repo_name = 'openstack/placement' @@ -75,8 +75,8 @@ html_theme_options = { # (source start file, target name, title, author, documentclass # [howto/manual]). latex_documents = [ - ('index', 'Placement.tex', u'OpenStack Placement API Documentation', - u'OpenStack Foundation', 'manual'), + ('index', 'Placement.tex', 'OpenStack Placement API Documentation', + 'OpenStack Foundation', 'manual'), ] # -- Options for openstackdocstheme ------------------------------------------- diff --git a/doc/source/conf.py b/doc/source/conf.py index ed2f78264..ffe86d02f 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -74,7 +74,7 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -copyright = u'2010-present, OpenStack Foundation' +copyright = '2010-present, OpenStack Foundation' # If true, the current module name will be prepended to all description # unit titles (such as .. function::). @@ -108,8 +108,8 @@ html_extra_path = ['_extra'] # (source start file, target name, title, author, documentclass # [howto/manual]). latex_documents = [ - ('index', 'doc-placement.tex', u'Placement Documentation', - u'OpenStack Foundation', 'manual'), + ('index', 'doc-placement.tex', 'Placement Documentation', + 'OpenStack Foundation', 'manual'), ] latex_domain_indices = False diff --git a/placement/tests/functional/db/test_resource_provider.py b/placement/tests/functional/db/test_resource_provider.py index fdd19f771..229c55403 100644 --- a/placement/tests/functional/db/test_resource_provider.py +++ b/placement/tests/functional/db/test_resource_provider.py @@ -892,7 +892,7 @@ class ResourceProviderListTestCase(tb.PlacementDbBaseTestCase): expected_rps = ['rp_1', 'rp_2'] self._run_get_all_by_filters(expected_rps) - filters = {'name': u'rp_1'} + filters = {'name': 'rp_1'} expected_rps = ['rp_1'] self._run_get_all_by_filters(expected_rps, filters=filters) @@ -939,7 +939,7 @@ class ResourceProviderListTestCase(tb.PlacementDbBaseTestCase): # We also want to verify that asking for a specific RP can also be # checking the resource usage. - filters = {'name': u'rp_1', 'resources': {orc.VCPU: 1}} + filters = {'name': 'rp_1', 'resources': {orc.VCPU: 1}} expected_rps = ['rp_1'] self._run_get_all_by_filters(expected_rps, filters=filters) @@ -990,13 +990,13 @@ class ResourceProviderListTestCase(tb.PlacementDbBaseTestCase): # Validate rps in "agg_a" or "agg_b" and named "rp_1" filters = {'member_of': [[uuidsentinel.agg_a, uuidsentinel.agg_b]], - 'name': u'rp_1'} + 'name': 'rp_1'} expected_rps = ['rp_1'] self._run_get_all_by_filters(expected_rps, filters=filters) # Validate rps in "agg_a" or "agg_b" and named "barnabas" filters = {'member_of': [[uuidsentinel.agg_a, uuidsentinel.agg_b]], - 'name': u'barnabas'} + 'name': 'barnabas'} expected_rps = [] self._run_get_all_by_filters(expected_rps, filters=filters) diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index d0fe917b1..d5527d7cb 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -22,9 +22,9 @@ # Keep these empty so that releasesnotes do not display an associated # version. # The short X.Y version -version = u'' +version = '' # The full version, including alpha/beta/rc tags -release = u'' +release = '' # -- General configuration --------------------------------------------------- @@ -45,9 +45,9 @@ extensions = [ master_doc = 'index' # General information about the project. -project = u'Placement Release Notes' -copyright = u'2018, Placement developers' -author = u'OpenStack' +project = 'Placement Release Notes' +copyright = '2018, Placement developers' +author = 'OpenStack' # openstackdocstheme options openstackdocs_repo_name = 'openstack/placement' openstackdocs_auto_name = False