diff --git a/cyborgclient/exceptions.py b/cyborgclient/exceptions.py index dd0ae31..25aeb8b 100644 --- a/cyborgclient/exceptions.py +++ b/cyborgclient/exceptions.py @@ -488,7 +488,7 @@ def from_response(response, method, url, message=None, traceback=None): # message key to the body that has the message and details. error = body.get(list(body)[0]) # NOTE(liusheng): the response.json() may like this: - # {u'error_message': u'{"debuginfo": null, "faultcode": + # {'error_message': '{"debuginfo": null, "faultcode": # "Client", "faultstring": "error message"}'}, the # "error_message" in the body is also a json string. if isinstance(error, str): diff --git a/doc/source/conf.py b/doc/source/conf.py index 0ac5d94..3a38e4a 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -36,8 +36,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'python-cyborgclient' -copyright = u'2017, OpenStack Developers' +project = 'python-cyborgclient' +copyright = '2017, OpenStack Developers' # openstackdocstheme options openstackdocs_repo_name = 'openstack/python-cyborgclient' @@ -71,8 +71,8 @@ htmlhelp_basename = '%sdoc' % project latex_documents = [ ('index', '%s.tex' % project, - u'%s Documentation' % project, - u'OpenStack Developers', 'manual'), + '%s Documentation' % project, + 'OpenStack Developers', 'manual'), ] # Example configuration for intersphinx: refer to the Python standard library. diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index ce9bb7e..ed6926d 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -51,7 +51,7 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -copyright = u'2017, OpenStack Developers' +copyright = '2017, OpenStack Developers' # openstackdocstheme options openstackdocs_repo_name = 'openstack/python-cyborgclient' @@ -198,8 +198,8 @@ htmlhelp_basename = 'cyborgclientReleaseNotesdoc' # author, documentclass [howto, manual, or own class]). latex_documents = [ ('index', 'cyborgclientReleaseNotes.tex', - u'cyborgclient Release Notes Documentation', - u'OpenStack Foundation', 'manual'), + 'cyborgclient Release Notes Documentation', + 'OpenStack Foundation', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -229,8 +229,8 @@ latex_documents = [ # (source start file, name, description, authors, manual section). man_pages = [ ('index', 'cyborgclientrereleasenotes', - u'cyborgclient Release Notes Documentation', - [u'OpenStack Foundation'], 1) + 'cyborgclient Release Notes Documentation', + ['OpenStack Foundation'], 1) ] # If true, show URL addresses after external links. @@ -244,8 +244,8 @@ man_pages = [ # dir menu entry, description, category) texinfo_documents = [ ('index', 'cyborgclient ReleaseNotes', - u'cyborgclient Release Notes Documentation', - u'OpenStack Foundation', 'cyborgclientReleaseNotes', + 'cyborgclient Release Notes Documentation', + 'OpenStack Foundation', 'cyborgclientReleaseNotes', 'One line description of project.', 'Miscellaneous'), ]