openstack/python-swiftclient
Code Issues Proposed changes

Merge "Fix test_multithreading on Python 3"

Browse Source
This commit is contained in:
Jenkins
2014-04-16 02:58:47 +00:00
committed by Gerrit Code Review
parent c810772623 ea498fb052
commit aaa563c749
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
swiftclient/multithreading.py
View File

@@ -16,6 +16,7 @@
from __future__ import print_function from __future__ import print_function
from itertools import chain from itertools import chain
import six
import sys import sys
from time import sleep from time import sleep
from six.moves.queue import Queue from six.moves.queue import Queue
@@ -184,7 +185,7 @@ class MultiThreadingManager(object):
(defaults to ``sys.stdout``) and the :meth:`error` method will print to the (defaults to ``sys.stdout``) and the :meth:`error` method will print to the
supplied ``error_stream`` (defaults to ``sys.stderr``). Both of these supplied ``error_stream`` (defaults to ``sys.stderr``). Both of these
printing methods will format the given string with any supplied ``*args`` printing methods will format the given string with any supplied ``*args``
(a la printf) and encode the result to utf8 if necessary. (a la printf). On Python 2, Unicode messages are encoded to utf8.
The attribute :attr:`self.error_count` is incremented once per error The attribute :attr:`self.error_count` is incremented once per error
message printed, so an application can tell if any worker threads message printed, so an application can tell if any worker threads
@@ -196,9 +197,11 @@ class MultiThreadingManager(object):
def __init__(self, print_stream=sys.stdout, error_stream=sys.stderr): def __init__(self, print_stream=sys.stdout, error_stream=sys.stderr):
""" """
:param print_stream: The stream to which :meth:`print_msg` sends :param print_stream: The stream to which :meth:`print_msg` sends
formatted messages, encoded to utf8 if necessary. formatted messages
:param error_stream: The stream to which :meth:`error` sends formatted :param error_stream: The stream to which :meth:`error` sends formatted
messages, encoded to utf8 if necessary. messages
On Python 2, Unicode messages are encoded to utf8.
""" """
self.print_stream = print_stream self.print_stream = print_stream
self.printer = QueueFunctionManager(self._print, 1, self) self.printer = QueueFunctionManager(self._print, 1, self)
@@ -259,7 +262,7 @@ class MultiThreadingManager(object):
def _print(self, item, stream=None): def _print(self, item, stream=None):
if stream is None: if stream is None:
stream = self.print_stream stream = self.print_stream
if isinstance(item, unicode): if six.PY2 and isinstance(item, unicode):
item = item.encode('utf8') item = item.encode('utf8')
print(item, file=stream) print(item, file=stream)

12
tests/test_multithreading.py
View File

@@ -320,16 +320,22 @@ class TestMultiThreadingManager(ThreadTestCase):
self.assertEqual(self.starting_thread_count, threading.active_count()) self.assertEqual(self.starting_thread_count, threading.active_count())
out_stream.seek(0) out_stream.seek(0)
if six.PY3:
over_the = "over the '\u062a\u062a'\n"
else:
over_the = "over the u'\\u062a\\u062a'\n"
self.assertEqual([ self.assertEqual([
'one-argument\n', 'one-argument\n',
'one fish, 88 fish\n', 'one fish, 88 fish\n',
'some\n', 'where\n', "over the u'\\u062a\\u062a'\n", 'some\n', 'where\n', over_the,
], list(out_stream.readlines())) ], list(out_stream.readlines()))
err_stream.seek(0) err_stream.seek(0)
first_item = u'I have 99 problems, but a \u062A\u062A is not one\n'
if six.PY2:
first_item = first_item.encode('utf8')
self.assertEqual([ self.assertEqual([
u'I have 99 problems, but a \u062A\u062A is not one\n'.encode( first_item,
'utf8'),
'one-error-argument\n', 'one-error-argument\n',
'Sometimes\n', '3.1% just\n', 'does not\n', 'work!\n', 'Sometimes\n', '3.1% just\n', 'does not\n', 'work!\n',
], list(err_stream.readlines())) ], list(err_stream.readlines()))