openstack
/
oslotest
Code Issues Proposed changes

Remove unnecessary unicode prefixes 

Change-Id: I554dee8e91468f8ea2dbcb99a925a2e9057ac378
This commit is contained in:
songwenping 2022-04-19 20:00:54 +08:00
parent 47fe8a263f
commit 49948dfad1
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/conf.py
View File

@ -29,7 +29,7 @@ modindex_common_prefix = ['oslotest.']
master_doc = 'index'
# General information about the project.
copyright = u'2014-2019, OpenStack Foundation'
copyright = '2014-2019, OpenStack Foundation'
# If true, '()' will be appended to :func: etc. cross-reference text.
add_function_parentheses = True

12
oslotest/tests/unit/test_base.py
View File

@ -137,24 +137,24 @@ class TestManualMock(base.BaseTestCase):
class TestTempFiles(base.BaseTestCase):
def test_create_unicode_files(self):
files = [["no_approve", u'ಠ_ಠ']]
files = [["no_approve", 'ಠ_ಠ']]
temps = self.create_tempfiles(files)
self.assertEqual(1, len(temps))
with open(temps[0], 'rb') as f:
contents = f.read()
self.assertEqual(u'ಠ_ಠ', six.text_type(contents, encoding='utf-8'))
self.assertEqual('ಠ_ಠ', six.text_type(contents, encoding='utf-8'))
def test_create_unicode_files_encoding(self):
files = [["embarrassed", u'⊙﹏⊙', 'utf-8']]
files = [["embarrassed", '⊙﹏⊙', 'utf-8']]
temps = self.create_tempfiles(files)
self.assertEqual(1, len(temps))
with open(temps[0], 'rb') as f:
contents = f.read()
self.assertEqual(u'⊙﹏⊙', six.text_type(contents, encoding='utf-8'))
self.assertEqual('⊙﹏⊙', six.text_type(contents, encoding='utf-8'))
def test_create_unicode_files_multi_encoding(self):
files = [
["embarrassed", u'⊙﹏⊙', 'utf-8'],
["embarrassed", '⊙﹏⊙', 'utf-8'],
['abc', 'abc', 'ascii'],
]
temps = self.create_tempfiles(files)
@ -169,7 +169,7 @@ class TestTempFiles(base.BaseTestCase):
raw_contents)
def test_create_bad_encoding(self):
files = [["hrm", u'ಠ~ಠ', 'ascii']]
files = [["hrm", 'ಠ~ಠ', 'ascii']]
self.assertRaises(UnicodeError, self.create_tempfiles, files)
def test_prefix(self):

10
oslotest/tests/unit/test_createfile.py
View File

@ -27,25 +27,25 @@ class CreateFileWithContentTest(base.BaseTestCase):
def test_create_unicode_files(self):
f = createfile.CreateFileWithContent(
"no_approve",
u'ಠ_ಠ',
'ಠ_ಠ',
)
f.setUp()
with open(f.path, 'rb') as f:
contents = f.read()
self.assertEqual(u'ಠ_ಠ', six.text_type(contents, encoding='utf-8'))
self.assertEqual('ಠ_ಠ', six.text_type(contents, encoding='utf-8'))
def test_create_unicode_files_encoding(self):
f = createfile.CreateFileWithContent(
"embarrassed", u'⊙﹏⊙', encoding='utf-8',
"embarrassed", '⊙﹏⊙', encoding='utf-8',
)
f.setUp()
with open(f.path, 'rb') as f:
contents = f.read()
self.assertEqual(u'⊙﹏⊙', six.text_type(contents, encoding='utf-8'))
self.assertEqual('⊙﹏⊙', six.text_type(contents, encoding='utf-8'))
def test_create_bad_encoding(self):
f = createfile.CreateFileWithContent(
"hrm", u'ಠ~ಠ', encoding='ascii',
"hrm", 'ಠ~ಠ', encoding='ascii',
)
self.assertRaises(UnicodeError, f.setUp)

4
releasenotes/source/conf.py
View File

@ -27,8 +27,8 @@ extensions = [
master_doc = 'index'
# General information about the project.
project = u'oslotest Release Notes'
copyright = u'2016, oslotest Developers'
project = 'oslotest Release Notes'
copyright = '2016, oslotest Developers'
# Release notes do not need a version in the title, they span
# multiple versions.