diff options
author | songwenping <songwenping@inspur.com> | 2022-04-19 20:00:54 +0800 |
---|---|---|
committer | songwenping <songwenping@inspur.com> | 2022-04-19 20:01:18 +0800 |
commit | 49948dfad1845ee151e815201c786e97c6e3c09c (patch) | |
tree | 0cfd64c7536c9ed4c26e1d03a3799d20430cd1b7 | |
parent | 47fe8a263fb2843879d9167da230d0a9550965cf (diff) | |
download | oslotest-49948dfad1845ee151e815201c786e97c6e3c09c.tar.gz |
Remove unnecessary unicode prefixes
Change-Id: I554dee8e91468f8ea2dbcb99a925a2e9057ac378
-rw-r--r-- | doc/source/conf.py | 2 | ||||
-rw-r--r-- | oslotest/tests/unit/test_base.py | 12 | ||||
-rw-r--r-- | oslotest/tests/unit/test_createfile.py | 10 | ||||
-rw-r--r-- | releasenotes/source/conf.py | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py index 6d034ed..3d7f3e6 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -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 diff --git a/oslotest/tests/unit/test_base.py b/oslotest/tests/unit/test_base.py index 86e76d4..63c66b6 100644 --- a/oslotest/tests/unit/test_base.py +++ b/oslotest/tests/unit/test_base.py @@ -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): diff --git a/oslotest/tests/unit/test_createfile.py b/oslotest/tests/unit/test_createfile.py index bed5a99..c16d409 100644 --- a/oslotest/tests/unit/test_createfile.py +++ b/oslotest/tests/unit/test_createfile.py @@ -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) diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 303a9d7..6bac3fb 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -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. |