openstack/oslo.messaging
Code Issues Proposed changes

remove unicode from code

Browse Source 
Change-Id: Ib2b816728307166450a4cea2ccdb3c4b550a0713
This commit is contained in:
xuanyandong 2021-01-03 16:11:46 +08:00
parent 5560e8e671
commit 642367cdfd
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oslo_messaging/_drivers/amqp1_driver/controller.py
View File

@ -1022,9 +1022,9 @@ class Controller(pyngus.ConnectionEventHandler):
def _do_connect(self): def _do_connect(self):
"""Establish connection and reply subscription on processor thread.""" """Establish connection and reply subscription on processor thread."""
host = self.hosts.current host = self.hosts.current
conn_props = {'properties': {u'process': self._command, conn_props = {'properties': {'process': self._command,
u'pid': self._pid, 'pid': self._pid,
u'node': self._node}} 'node': self._node}}
# only set hostname in the AMQP 1.0 Open performative if the message # only set hostname in the AMQP 1.0 Open performative if the message
# bus can interpret it as the virtual host. We leave it unspecified # bus can interpret it as the virtual host. We leave it unspecified
# since apparently noone can agree on how it should be used otherwise! # since apparently noone can agree on how it should be used otherwise!

2
oslo_messaging/rpc/server.py
View File

@ -168,7 +168,7 @@ class RPCServer(msg_server.MessageHandlingServer):
# by another exception raised by a log handler during # by another exception raised by a log handler during
# LOG.debug(). So keep a copy and delete it later. # LOG.debug(). So keep a copy and delete it later.
failure = e.exc_info failure = e.exc_info
LOG.debug(u'Expected exception during message handling (%s)', e) LOG.debug('Expected exception during message handling (%s)', e)
except rpc_dispatcher.NoSuchMethod as e: except rpc_dispatcher.NoSuchMethod as e:
failure = sys.exc_info() failure = sys.exc_info()
if e.method.endswith('_ignore_errors'): if e.method.endswith('_ignore_errors'):

20
oslo_messaging/tests/test_exception_serialization.py
View File

@ -198,9 +198,9 @@ class DeserializeRemoteExceptionTestCase(test_utils.BaseTestCase):
args=[], args=[],
kwargs={}, kwargs={},
str=("Remote error: NovaStyleException test\n" str=("Remote error: NovaStyleException test\n"
"[%r]." % u'traceback\ntraceback\n'), "[%r]." % 'traceback\ntraceback\n'),
msg=("Remote error: NovaStyleException test\n" msg=("Remote error: NovaStyleException test\n"
"[%r]." % u'traceback\ntraceback\n'), "[%r]." % 'traceback\ntraceback\n'),
remote_name='RemoteError', remote_name='RemoteError',
remote_args=(), remote_args=(),
remote_kwargs={'exc_type': 'NovaStyleException', remote_kwargs={'exc_type': 'NovaStyleException',
@ -214,9 +214,9 @@ class DeserializeRemoteExceptionTestCase(test_utils.BaseTestCase):
args=[], args=[],
kwargs={}, kwargs={},
str=("Remote error: Exception test\n" str=("Remote error: Exception test\n"
"[%r]." % u'traceback\ntraceback\n'), "[%r]." % 'traceback\ntraceback\n'),
msg=("Remote error: Exception test\n" msg=("Remote error: Exception test\n"
"[%r]." % u'traceback\ntraceback\n'), "[%r]." % 'traceback\ntraceback\n'),
remote_name='RemoteError', remote_name='RemoteError',
remote_args=(), remote_args=(),
remote_kwargs={'exc_type': 'Exception', remote_kwargs={'exc_type': 'Exception',
@ -230,9 +230,9 @@ class DeserializeRemoteExceptionTestCase(test_utils.BaseTestCase):
args=[], args=[],
kwargs={}, kwargs={},
str=("Remote error: FarcicalError test\n" str=("Remote error: FarcicalError test\n"
"[%r]." % u'traceback\ntraceback\n'), "[%r]." % 'traceback\ntraceback\n'),
msg=("Remote error: FarcicalError test\n" msg=("Remote error: FarcicalError test\n"
"[%r]." % u'traceback\ntraceback\n'), "[%r]." % 'traceback\ntraceback\n'),
remote_name='RemoteError', remote_name='RemoteError',
remote_args=(), remote_args=(),
remote_kwargs={'exc_type': 'FarcicalError', remote_kwargs={'exc_type': 'FarcicalError',
@ -246,9 +246,9 @@ class DeserializeRemoteExceptionTestCase(test_utils.BaseTestCase):
args=[], args=[],
kwargs={'foobar': 'blaa'}, kwargs={'foobar': 'blaa'},
str=("Remote error: Exception test\n" str=("Remote error: Exception test\n"
"[%r]." % u'traceback\ntraceback\n'), "[%r]." % 'traceback\ntraceback\n'),
msg=("Remote error: Exception test\n" msg=("Remote error: Exception test\n"
"[%r]." % u'traceback\ntraceback\n'), "[%r]." % 'traceback\ntraceback\n'),
remote_name='RemoteError', remote_name='RemoteError',
remote_args=(), remote_args=(),
remote_kwargs={'exc_type': 'Exception', remote_kwargs={'exc_type': 'Exception',
@ -262,9 +262,9 @@ class DeserializeRemoteExceptionTestCase(test_utils.BaseTestCase):
args=[], args=[],
kwargs={}, kwargs={},
str=("Remote error: SystemExit test\n" str=("Remote error: SystemExit test\n"
"[%r]." % u'traceback\ntraceback\n'), "[%r]." % 'traceback\ntraceback\n'),
msg=("Remote error: SystemExit test\n" msg=("Remote error: SystemExit test\n"
"[%r]." % u'traceback\ntraceback\n'), "[%r]." % 'traceback\ntraceback\n'),
remote_name='RemoteError', remote_name='RemoteError',
remote_args=(), remote_args=(),
remote_kwargs={'exc_type': 'SystemExit', remote_kwargs={'exc_type': 'SystemExit',

2
releasenotes/source/conf.py
View File

@ -27,7 +27,7 @@
# -- Project information -------------------------------------------------- # -- Project information --------------------------------------------------
# General information about the project. # General information about the project.
copyright = u'2016, oslo.messaging Developers' copyright = '2016, oslo.messaging 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.