summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-02-03 15:04:07 +0000
committerGerrit Code Review <review@openstack.org>2021-02-03 15:04:07 +0000
commit11e13abf9b12f8b648165b6bc8637d8f0dd2c884 (patch)
treec3dd86c9b9c609ec9c965062e783a2385d2447fd
parent3b26a60c9242381b6dcb74658941c335b2b69471 (diff)
parent642367cdfd14bf9507116eb263c454b8b4e2d6e1 (diff)
downloadoslo-messaging-11e13abf9b12f8b648165b6bc8637d8f0dd2c884.tar.gz
Merge "remove unicode from code"
-rw-r--r--oslo_messaging/_drivers/amqp1_driver/controller.py6
-rw-r--r--oslo_messaging/rpc/server.py2
-rw-r--r--oslo_messaging/tests/test_exception_serialization.py20
-rw-r--r--releasenotes/source/conf.py2
4 files changed, 15 insertions, 15 deletions
diff --git a/oslo_messaging/_drivers/amqp1_driver/controller.py b/oslo_messaging/_drivers/amqp1_driver/controller.py
index 6297507..5451cab 100644
--- a/oslo_messaging/_drivers/amqp1_driver/controller.py
+++ b/oslo_messaging/_drivers/amqp1_driver/controller.py
@@ -1022,9 +1022,9 @@ class Controller(pyngus.ConnectionEventHandler):
def _do_connect(self):
"""Establish connection and reply subscription on processor thread."""
host = self.hosts.current
- conn_props = {'properties': {u'process': self._command,
- u'pid': self._pid,
- u'node': self._node}}
+ conn_props = {'properties': {'process': self._command,
+ 'pid': self._pid,
+ 'node': self._node}}
# 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
# since apparently noone can agree on how it should be used otherwise!
diff --git a/oslo_messaging/rpc/server.py b/oslo_messaging/rpc/server.py
index 03517c3..78557e2 100644
--- a/oslo_messaging/rpc/server.py
+++ b/oslo_messaging/rpc/server.py
@@ -168,7 +168,7 @@ class RPCServer(msg_server.MessageHandlingServer):
# by another exception raised by a log handler during
# LOG.debug(). So keep a copy and delete it later.
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:
failure = sys.exc_info()
if e.method.endswith('_ignore_errors'):
diff --git a/oslo_messaging/tests/test_exception_serialization.py b/oslo_messaging/tests/test_exception_serialization.py
index 93b63c5..f4ca495 100644
--- a/oslo_messaging/tests/test_exception_serialization.py
+++ b/oslo_messaging/tests/test_exception_serialization.py
@@ -198,9 +198,9 @@ class DeserializeRemoteExceptionTestCase(test_utils.BaseTestCase):
args=[],
kwargs={},
str=("Remote error: NovaStyleException test\n"
- "[%r]." % u'traceback\ntraceback\n'),
+ "[%r]." % 'traceback\ntraceback\n'),
msg=("Remote error: NovaStyleException test\n"
- "[%r]." % u'traceback\ntraceback\n'),
+ "[%r]." % 'traceback\ntraceback\n'),
remote_name='RemoteError',
remote_args=(),
remote_kwargs={'exc_type': 'NovaStyleException',
@@ -214,9 +214,9 @@ class DeserializeRemoteExceptionTestCase(test_utils.BaseTestCase):
args=[],
kwargs={},
str=("Remote error: Exception test\n"
- "[%r]." % u'traceback\ntraceback\n'),
+ "[%r]." % 'traceback\ntraceback\n'),
msg=("Remote error: Exception test\n"
- "[%r]." % u'traceback\ntraceback\n'),
+ "[%r]." % 'traceback\ntraceback\n'),
remote_name='RemoteError',
remote_args=(),
remote_kwargs={'exc_type': 'Exception',
@@ -230,9 +230,9 @@ class DeserializeRemoteExceptionTestCase(test_utils.BaseTestCase):
args=[],
kwargs={},
str=("Remote error: FarcicalError test\n"
- "[%r]." % u'traceback\ntraceback\n'),
+ "[%r]." % 'traceback\ntraceback\n'),
msg=("Remote error: FarcicalError test\n"
- "[%r]." % u'traceback\ntraceback\n'),
+ "[%r]." % 'traceback\ntraceback\n'),
remote_name='RemoteError',
remote_args=(),
remote_kwargs={'exc_type': 'FarcicalError',
@@ -246,9 +246,9 @@ class DeserializeRemoteExceptionTestCase(test_utils.BaseTestCase):
args=[],
kwargs={'foobar': 'blaa'},
str=("Remote error: Exception test\n"
- "[%r]." % u'traceback\ntraceback\n'),
+ "[%r]." % 'traceback\ntraceback\n'),
msg=("Remote error: Exception test\n"
- "[%r]." % u'traceback\ntraceback\n'),
+ "[%r]." % 'traceback\ntraceback\n'),
remote_name='RemoteError',
remote_args=(),
remote_kwargs={'exc_type': 'Exception',
@@ -262,9 +262,9 @@ class DeserializeRemoteExceptionTestCase(test_utils.BaseTestCase):
args=[],
kwargs={},
str=("Remote error: SystemExit test\n"
- "[%r]." % u'traceback\ntraceback\n'),
+ "[%r]." % 'traceback\ntraceback\n'),
msg=("Remote error: SystemExit test\n"
- "[%r]." % u'traceback\ntraceback\n'),
+ "[%r]." % 'traceback\ntraceback\n'),
remote_name='RemoteError',
remote_args=(),
remote_kwargs={'exc_type': 'SystemExit',
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index f847170..6d444a3 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -27,7 +27,7 @@
# -- Project information --------------------------------------------------
# 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
# multiple versions.