diff options
| author | Zuul <zuul@review.opendev.org> | 2021-04-16 11:45:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-04-16 11:45:36 +0000 |
| commit | 2c067a916c75336bfc154bde71880f73c7133ea8 (patch) | |
| tree | 94a26595bbc950307e792dd34e78e4e83d22adf5 | |
| parent | 127b3589233e769d3a19d2978a694f4bfcc59f1c (diff) | |
| parent | 333e9ee27e705ee04f1ef09f60f826e81a9dcb53 (diff) | |
| download | oslo-log-2c067a916c75336bfc154bde71880f73c7133ea8.tar.gz | |
Merge "remove unicode from code"
| -rw-r--r-- | doc/source/conf.py | 2 | ||||
| -rw-r--r-- | oslo_log/tests/unit/test_log.py | 10 | ||||
| -rw-r--r-- | releasenotes/source/conf.py | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py index 4ae81f6..1e22995 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -38,7 +38,7 @@ openstackdocs_bug_tag = '' master_doc = 'index' # General information about the project. -copyright = u'2014, OpenStack Foundation' +copyright = '2014, OpenStack Foundation' # -- Options for HTML output -------------------------------------------------- diff --git a/oslo_log/tests/unit/test_log.py b/oslo_log/tests/unit/test_log.py index 239fb1f..723cffb 100644 --- a/oslo_log/tests/unit/test_log.py +++ b/oslo_log/tests/unit/test_log.py @@ -624,7 +624,7 @@ class JSONFormatterTestCase(LogTestBase): expected = b'\\u2622' # see ContextFormatterTestCase.test_can_process_strings expected = '\\\\xe2\\\\x98\\\\xa2' - self.log.info(b'%s', u'\u2622'.encode('utf8')) + self.log.info(b'%s', '\u2622'.encode('utf8')) self.assertIn(expected, self.stream.getvalue()) def test_exception(self): @@ -964,7 +964,7 @@ class ContextFormatterTestCase(LogTestBase): "%(user_identity)s]: " "%(message)s") ctxt = _fake_context() - ctxt.request_id = u'99' + ctxt.request_id = '99' message = 'test' self.log.info(message, context=ctxt) expected = ("HAS CONTEXT [%s %s %s %s %s %s]: %s\n" % @@ -981,7 +981,7 @@ class ContextFormatterTestCase(LogTestBase): logging_user_identity_format="%(user)s " "%(tenant)s") ctxt = _fake_context() - ctxt.request_id = u'99' + ctxt.request_id = '99' message = 'test' self.log.info(message, context=ctxt) expected = ("HAS CONTEXT [%s %s %s]: %s\n" % @@ -1024,7 +1024,7 @@ class ContextFormatterTestCase(LogTestBase): # or it will fail and inserting byte string in unicode string # causes such formatting expected = '\\xe2\\x98\\xa2' - self.log.info(b'%s', u'\u2622'.encode('utf8')) + self.log.info(b'%s', '\u2622'.encode('utf8')) self.assertIn(expected, self.stream.getvalue()) def test_dict_args_with_unicode(self): @@ -1923,7 +1923,7 @@ class KeywordArgumentAdapterTestCase(BaseTestCase): class UnicodeConversionTestCase(BaseTestCase): - _MSG = u'Message with unicode char \ua000 in the middle' + _MSG = 'Message with unicode char \ua000 in the middle' def test_ascii_to_unicode(self): msg = self._MSG diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 627699d..e060d4e 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -31,7 +31,7 @@ extensions = [ master_doc = 'index' # General information about the project. -copyright = u'2016, oslo.log Developers' +copyright = '2016, oslo.log Developers' # Release notes do not need a version in the title, they span # multiple versions. |