openstack/python-troveclient
Code Issues Proposed changes

remove unicode from code

Browse Source 
Change-Id: Iadc87779bf513c9d04847b6cf8ecbc60b300d7db
Implements: blueprint remove-unicode
This commit is contained in:
likui 2021-01-03 13:03:32 +08:00
parent 182301ac68
commit 3bdae37673
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/conf.py
View File

@ -56,7 +56,7 @@ source_suffix = '.rst'
master_doc = 'index' master_doc = 'index'
copyright = u'2014, OpenStack Foundation' copyright = '2014, OpenStack Foundation'
exclude_trees = [] exclude_trees = []
@ -64,6 +64,6 @@ pygments_style = 'native'
htmlhelp_basename = 'python-troveclientdoc' htmlhelp_basename = 'python-troveclientdoc'
latex_documents = [ latex_documents = [
('index', 'python-troveclient.tex', u'python-troveclient Documentation', ('index', 'python-troveclient.tex', 'python-troveclient Documentation',
u'OpenStack', 'manual'), 'OpenStack', 'manual'),
] ]

16
releasenotes/source/conf.py
View File

@ -54,8 +54,8 @@ source_suffix = '.rst'
master_doc = 'index' master_doc = 'index'
# General information about the project. # General information about the project.
project = u'Trove Client Release Notes' project = 'Trove Client Release Notes'
copyright = u'2016, Trove developers' copyright = '2016, Trove developers'
# Release notes are version independent. # Release notes are version independent.
# The short X.Y version. # The short X.Y version.
@ -204,8 +204,8 @@ latex_elements = {
# (source start file, target name, title, # (source start file, target name, title,
# author, documentclass [howto, manual, or own class]). # author, documentclass [howto, manual, or own class]).
latex_documents = [ latex_documents = [
('index', 'TroveClientReleaseNotes.tex', u'Trove Client Release Notes Documentation', ('index', 'TroveClientReleaseNotes.tex', 'Trove Client Release Notes Documentation',
u'Trove developers', 'manual'), 'Trove developers', 'manual'),
] ]
# The name of an image file (relative to this directory) to place at the top of # The name of an image file (relative to this directory) to place at the top of
@ -234,8 +234,8 @@ latex_documents = [
# One entry per manual page. List of tuples # One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section). # (source start file, name, description, authors, manual section).
man_pages = [ man_pages = [
('index', 'troveclientreleasenotes', u'Trove Client Release Notes Documentation', ('index', 'troveclientreleasenotes', 'Trove Client Release Notes Documentation',
[u'Trove developers'], 1) ['Trove developers'], 1)
] ]
# If true, show URL addresses after external links. # If true, show URL addresses after external links.
@ -248,8 +248,8 @@ man_pages = [
# (source start file, target name, title, author, # (source start file, target name, title, author,
# dir menu entry, description, category) # dir menu entry, description, category)
texinfo_documents = [ texinfo_documents = [
('index', 'TroveClientReleaseNotes', u'Trove Client Release Notes Documentation', ('index', 'TroveClientReleaseNotes', 'Trove Client Release Notes Documentation',
u'Trove developers', 'TroveClientReleaseNotes', 'OpenStack Database as a Service.', 'Trove developers', 'TroveClientReleaseNotes', 'OpenStack Database as a Service.',
'Miscellaneous'), 'Miscellaneous'),
] ]

46
troveclient/tests/test_shell.py
View File

@ -65,8 +65,8 @@ def _create_ver_list(versions):
class ShellTest(testtools.TestCase): class ShellTest(testtools.TestCase):
version_id = u'v2.0' version_id = 'v2.0'
links = [{u'href': u'http://no.where/v2.0', u'rel': u'self'}] links = [{'href': 'http://no.where/v2.0', 'rel': 'self'}]
v2_version = fixture.V2Discovery(V2_URL) v2_version = fixture.V2Discovery(V2_URL)
v2_version.updated_str = UPDATED v2_version.updated_str = UPDATED
@ -162,8 +162,8 @@ class ShellTest(testtools.TestCase):
self.fail('CommandError not raised') self.fail('CommandError not raised')
@mock.patch('keystoneauth1.discover.get_version_data', @mock.patch('keystoneauth1.discover.get_version_data',
return_value=[{u'status': u'stable', u'id': version_id, return_value=[{'status': 'stable', 'id': version_id,
u'links': links}]) 'links': links}])
@mock.patch('troveclient.v1.datastores.DatastoreVersions.list') @mock.patch('troveclient.v1.datastores.DatastoreVersions.list')
@requests_mock.Mocker() @requests_mock.Mocker()
def test_datastore_version_list(self, mock_discover, def test_datastore_version_list(self, mock_discover,
@ -183,8 +183,8 @@ class ShellTest(testtools.TestCase):
self.assertEqual(expected, (stdout + stderr)) self.assertEqual(expected, (stdout + stderr))
@mock.patch('keystoneauth1.discover.get_version_data', @mock.patch('keystoneauth1.discover.get_version_data',
return_value=[{u'status': u'stable', u'id': version_id, return_value=[{'status': 'stable', 'id': version_id,
u'links': links}]) 'links': links}])
@mock.patch('troveclient.v1.datastores.Datastores.list') @mock.patch('troveclient.v1.datastores.Datastores.list')
@requests_mock.Mocker() @requests_mock.Mocker()
def test_get_datastore_list(self, mock_discover, def test_get_datastore_list(self, mock_discover,
@ -206,8 +206,8 @@ class ShellTest(testtools.TestCase):
class ShellTestKeystoneV3(ShellTest): class ShellTestKeystoneV3(ShellTest):
version_id = u'v3' version_id = 'v3'
links = [{u'href': u'http://no.where/v3', u'rel': u'self'}] links = [{'href': 'http://no.where/v3', 'rel': 'self'}]
v3_version = fixture.V3Discovery(V3_URL) v3_version = fixture.V3Discovery(V3_URL)
v3_version.updated_str = UPDATED v3_version.updated_str = UPDATED
@ -282,15 +282,15 @@ class ShellTestKeystoneV3(ShellTest):
def test_no_project_id(self): def test_no_project_id(self):
required = ( required = (
u'You must provide a ' 'You must provide a '
u'project_id or project_name (with ' 'project_id or project_name (with '
u'project_domain_name or project_domain_id) via ' 'project_domain_name or project_domain_id) via '
u' --os-project-id (env[OS_PROJECT_ID])' ' --os-project-id (env[OS_PROJECT_ID])'
u' --os-project-name (env[OS_PROJECT_NAME]),' ' --os-project-name (env[OS_PROJECT_NAME]),'
u' --os-project-domain-id ' ' --os-project-domain-id '
u'(env[OS_PROJECT_DOMAIN_ID])' '(env[OS_PROJECT_DOMAIN_ID])'
u' --os-project-domain-name ' ' --os-project-domain-name '
u'(env[OS_PROJECT_DOMAIN_NAME])' '(env[OS_PROJECT_DOMAIN_NAME])'
) )
self.make_env(exclude='OS_PROJECT_ID') self.make_env(exclude='OS_PROJECT_ID')
try: try:
@ -301,8 +301,8 @@ class ShellTestKeystoneV3(ShellTest):
self.fail('CommandError not raised') self.fail('CommandError not raised')
@mock.patch('keystoneauth1.discover.get_version_data', @mock.patch('keystoneauth1.discover.get_version_data',
return_value=[{u'status': u'stable', u'id': version_id, return_value=[{'status': 'stable', 'id': version_id,
u'links': links}]) 'links': links}])
@mock.patch('troveclient.v1.datastores.DatastoreVersions.list') @mock.patch('troveclient.v1.datastores.DatastoreVersions.list')
@requests_mock.Mocker() @requests_mock.Mocker()
def test_datastore_version_list(self, mock_discover, def test_datastore_version_list(self, mock_discover,
@ -323,8 +323,8 @@ class ShellTestKeystoneV3(ShellTest):
self.assertEqual(expected, (stdout + stderr)) self.assertEqual(expected, (stdout + stderr))
@mock.patch('keystoneauth1.discover.get_version_data', @mock.patch('keystoneauth1.discover.get_version_data',
return_value=[{u'status': u'stable', u'id': version_id, return_value=[{'status': 'stable', 'id': version_id,
u'links': links}]) 'links': links}])
@mock.patch('troveclient.v1.datastores.Datastores.list') @mock.patch('troveclient.v1.datastores.Datastores.list')
@requests_mock.Mocker() @requests_mock.Mocker()
def test_get_datastore_list(self, mock_discover, def test_get_datastore_list(self, mock_discover,
@ -345,8 +345,8 @@ class ShellTestKeystoneV3(ShellTest):
self.assertEqual(expected, (stdout + stderr)) self.assertEqual(expected, (stdout + stderr))
@mock.patch('keystoneauth1.discover.get_version_data', @mock.patch('keystoneauth1.discover.get_version_data',
return_value=[{u'status': u'stable', u'id': version_id, return_value=[{'status': 'stable', 'id': version_id,
u'links': links}]) 'links': links}])
@requests_mock.Mocker() @requests_mock.Mocker()
def test_invalid_client_version(self, mock_discover, def test_invalid_client_version(self, mock_discover,
mock_requests): mock_requests):