[Python-checkins] cpython (3.4): asyncio: pep8-ify the code.
larry.hastings
python-checkins at python.org
Mon Mar 17 07:32:14 CET 2014
http://hg.python.org/cpython/rev/6c5f3e12e318
changeset: 89735:6c5f3e12e318
branch: 3.4
user: Yury Selivanov <yselivanov at sprymix.com>
date: Tue Feb 18 22:56:15 2014 -0500
summary:
asyncio: pep8-ify the code.
files:
Lib/asyncio/base_events.py | 11 +++++----
Lib/asyncio/subprocess.py | 5 ++-
Lib/test/test_asyncio/test_subprocess.py | 12 +++++++++-
Lib/test/test_asyncio/test_tasks.py | 4 ++-
Lib/test/test_asyncio/test_unix_events.py | 6 +++-
5 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -605,10 +605,10 @@
return transport, protocol
@tasks.coroutine
- def subprocess_exec(self, protocol_factory, program, *args, stdin=subprocess.PIPE,
- stdout=subprocess.PIPE, stderr=subprocess.PIPE,
- universal_newlines=False, shell=False, bufsize=0,
- **kwargs):
+ def subprocess_exec(self, protocol_factory, program, *args,
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE, universal_newlines=False,
+ shell=False, bufsize=0, **kwargs):
if universal_newlines:
raise ValueError("universal_newlines must be False")
if shell:
@@ -623,7 +623,8 @@
% type(arg).__name__)
protocol = protocol_factory()
transport = yield from self._make_subprocess_transport(
- protocol, popen_args, False, stdin, stdout, stderr, bufsize, **kwargs)
+ protocol, popen_args, False, stdin, stdout, stderr,
+ bufsize, **kwargs)
return transport, protocol
def set_exception_handler(self, handler):
diff --git a/Lib/asyncio/subprocess.py b/Lib/asyncio/subprocess.py
--- a/Lib/asyncio/subprocess.py
+++ b/Lib/asyncio/subprocess.py
@@ -180,8 +180,9 @@
return Process(transport, protocol, loop)
@tasks.coroutine
-def create_subprocess_exec(program, *args, stdin=None, stdout=None, stderr=None,
- loop=None, limit=streams._DEFAULT_LIMIT, **kwds):
+def create_subprocess_exec(program, *args, stdin=None, stdout=None,
+ stderr=None, loop=None,
+ limit=streams._DEFAULT_LIMIT, **kwds):
if loop is None:
loop = events.get_event_loop()
protocol_factory = lambda: SubprocessStreamProtocol(limit=limit,
diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py
--- a/Lib/test/test_asyncio/test_subprocess.py
+++ b/Lib/test/test_asyncio/test_subprocess.py
@@ -21,6 +21,7 @@
'sys.stdout.buffer.write(data)'))]
class SubprocessMixin:
+
def test_stdin_stdout(self):
args = PROGRAM_CAT
@@ -132,6 +133,7 @@
if sys.platform != 'win32':
# Unix
class SubprocessWatcherMixin(SubprocessMixin):
+
Watcher = None
def setUp(self):
@@ -151,14 +153,20 @@
self.loop.close()
policy.set_event_loop(None)
- class SubprocessSafeWatcherTests(SubprocessWatcherMixin, unittest.TestCase):
+ class SubprocessSafeWatcherTests(SubprocessWatcherMixin,
+ unittest.TestCase):
+
Watcher = unix_events.SafeChildWatcher
- class SubprocessFastWatcherTests(SubprocessWatcherMixin, unittest.TestCase):
+ class SubprocessFastWatcherTests(SubprocessWatcherMixin,
+ unittest.TestCase):
+
Watcher = unix_events.FastChildWatcher
+
else:
# Windows
class SubprocessProactorTests(SubprocessMixin, unittest.TestCase):
+
def setUp(self):
policy = asyncio.get_event_loop_policy()
self.loop = asyncio.ProactorEventLoop()
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -876,6 +876,7 @@
self.assertEqual(set(f.result() for f in done), {'a', 'b'})
def test_as_completed_duplicate_coroutines(self):
+
@asyncio.coroutine
def coro(s):
return s
@@ -884,7 +885,8 @@
def runner():
result = []
c = coro('ham')
- for f in asyncio.as_completed([c, c, coro('spam')], loop=self.loop):
+ for f in asyncio.as_completed([c, c, coro('spam')],
+ loop=self.loop):
result.append((yield from f))
return result
diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py
--- a/Lib/test/test_asyncio/test_unix_events.py
+++ b/Lib/test/test_asyncio/test_unix_events.py
@@ -367,7 +367,8 @@
tr._close.assert_called_with(err)
m_logexc.assert_called_with(
test_utils.MockPattern(
- 'Fatal read error on pipe transport\nprotocol:.*\ntransport:.*'),
+ 'Fatal read error on pipe transport'
+ '\nprotocol:.*\ntransport:.*'),
exc_info=(OSError, MOCK_ANY, MOCK_ANY))
@unittest.mock.patch('os.read')
@@ -664,7 +665,8 @@
self.assertTrue(tr._closing)
m_logexc.assert_called_with(
test_utils.MockPattern(
- 'Fatal write error on pipe transport\nprotocol:.*\ntransport:.*'),
+ 'Fatal write error on pipe transport'
+ '\nprotocol:.*\ntransport:.*'),
exc_info=(OSError, MOCK_ANY, MOCK_ANY))
self.assertEqual(1, tr._conn_lost)
test_utils.run_briefly(self.loop)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list