openstack/oslo.config
Code Issues Proposed changes

remove unicode from code

Browse Source 
Change-Id: I062829a44a62014e88f285a82b6800e37f00ff28
This commit is contained in:
xuanyandong 2021-01-03 15:59:18 +08:00 committed by Yandong Xuan
parent cfa256464e
commit 604bde417b
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/conf.py
View File

@ -51,7 +51,7 @@ source_suffix = '.rst'
master_doc = 'index' master_doc = 'index'
# General information about the project. # General information about the project.
copyright = u'2013, OpenStack Foundation' copyright = '2013, OpenStack Foundation'
# If true, '()' will be appended to :func: etc. cross-reference text. # If true, '()' will be appended to :func: etc. cross-reference text.
add_function_parentheses = True add_function_parentheses = True

6
oslo_config/generator.py
View File

@ -288,11 +288,9 @@ class _OptFormatter:
else: else:
opt_help = opt.help opt_help = opt.help
help_text = u'%s%s (%s)' % (opt_prefix, help_text = '%s%s (%s)' % (opt_prefix, opt_help, opt_type)
opt_help,
opt_type)
else: else:
help_text = u'(%s)' % opt_type help_text = '(%s)' % opt_type
lines = self._format_help(help_text) lines = self._format_help(help_text)
if getattr(opt.type, 'min', None) is not None: if getattr(opt.type, 'min', None) is not None:

2
oslo_config/tests/test_get_location.py
View File

@ -137,7 +137,7 @@ class GetLocationTestCase(base.BaseTestCase):
def _write_opt_to_tmp_file(self, group, option, value): def _write_opt_to_tmp_file(self, group, option, value):
filename = tempfile.mktemp() filename = tempfile.mktemp()
with io.open(filename, 'w', encoding='utf-8') as f: with io.open(filename, 'w', encoding='utf-8') as f:
f.write(textwrap.dedent(u''' f.write(textwrap.dedent('''
[{group}] [{group}]
{option} = {value} {option} = {value}
''').format( ''').format(

10
releasenotes/source/conf.py
View File

@ -60,7 +60,7 @@ source_suffix = '.rst'
master_doc = 'index' master_doc = 'index'
# General information about the project. # General information about the project.
copyright = u'2016, oslo.config Developers' copyright = '2016, oslo.config Developers'
# Release notes do not need a version in the title, they span # Release notes do not need a version in the title, they span
# multiple versions. # multiple versions.
@ -196,8 +196,8 @@ html_static_path = ['_static']
# (source start file, name, description, authors, manual section). # (source start file, name, description, authors, manual section).
man_pages = [ man_pages = [
('index', 'oslo.configreleasenotes', ('index', 'oslo.configreleasenotes',
u'oslo.config Release Notes Documentation', 'oslo.config Release Notes Documentation',
[u'oslo.config Developers'], 1) ['oslo.config Developers'], 1)
] ]
# If true, show URL addresses after external links. # If true, show URL addresses after external links.
@ -211,8 +211,8 @@ man_pages = [
# dir menu entry, description, category) # dir menu entry, description, category)
texinfo_documents = [ texinfo_documents = [
('index', 'oslo.configReleaseNotes', ('index', 'oslo.configReleaseNotes',
u'oslo.config Release Notes Documentation', 'oslo.config Release Notes Documentation',
u'oslo.config Developers', 'oslo.configReleaseNotes', 'oslo.config Developers', 'oslo.configReleaseNotes',
'An OpenStack library for parsing configuration options from the command' 'An OpenStack library for parsing configuration options from the command'
' line and configuration files.', ' line and configuration files.',
'Miscellaneous'), 'Miscellaneous'),