Bump yapf version to 0.20.1

ci/travis.sh

@@ -2,9 +2,7 @@
 
 set -ex
 
-# 0.20.0 is broken (https://github.com/google/yapf/issues/484)
-# The fix has been merged so hopefully 0.21.0 will be usable again
-YAPF_VERSION=0.19.0
+YAPF_VERSION=0.20.1
 
 git rev-parse HEAD
 

trio/_core/tests/test_run.py

@@ -185,9 +185,8 @@ async def main():
     with pytest.raises(_core.MultiError) as excinfo:
         _core.run(main)
     print(excinfo.value)
-    assert set(type(exc) for exc in excinfo.value.exceptions) == {
-        ValueError, KeyError
-    }
+    assert set(type(exc)
+               for exc in excinfo.value.exceptions) == {ValueError, KeyError}
 
 
 def test_two_child_crashes():
@@ -201,9 +200,8 @@ async def main():
 
     with pytest.raises(_core.MultiError) as excinfo:
         _core.run(main)
-    assert set(type(exc) for exc in excinfo.value.exceptions) == {
-        ValueError, KeyError
-    }
+    assert set(type(exc)
+               for exc in excinfo.value.exceptions) == {ValueError, KeyError}
 
 
 async def test_child_crash_wakes_parent():

trio/_socket.py

@@ -530,8 +530,8 @@ async def _resolve_address(self, address, flags):
             if not self._sock.getsockopt(IPPROTO_IPV6, IPV6_V6ONLY):
                 flags |= AI_V4MAPPED
         gai_res = await getaddrinfo(
-            host, port, self._sock.family,
-            real_socket_type(self._sock.type), self._sock.proto, flags
+            host, port, self._sock.family, real_socket_type(self._sock.type),
+            self._sock.proto, flags
         )
         # AFAICT from the spec it's not possible for getaddrinfo to return an
         # empty list.

trio/_sync.py

@@ -166,8 +166,8 @@ def __init__(self, total_tokens):
     def __repr__(self):
         return (
             "<trio.CapacityLimiter at {:#x}, {}/{} with {} waiting>".format(
-                id(self),
-                len(self._borrowers), self._total_tokens, len(self._lot)
+                id(self), len(self._borrowers), self._total_tokens,
+                len(self._lot)
             )
         )
 

trio/_util.py

@@ -133,9 +133,9 @@ async def __aexit__(self, type, value, traceback):
                 # was passed to throw() and later wrapped into a RuntimeError
                 # (see PEP 479).
                 if (
-                        isinstance(value,
-                                   (StopIteration, StopAsyncIteration))
-                        and exc.__cause__ is value
+                    isinstance(value,
+                               (StopIteration, StopAsyncIteration))
+                    and exc.__cause__ is value
                 ):
                     return False
                 raise

trio/testing/_check_streams.py

@@ -245,6 +245,7 @@ async def receive_send_then_close():
     # we can't do it here. Maybe we could do a bit better with
     #     https://github.com/python-trio/trio/issues/77
     async with _ForceCloseBoth(await stream_maker()) as (s, r):
+
         async def expect_cancelled(afn, *args):
             with _assert_raises(_core.Cancelled):
                 await afn(*args)
@@ -315,6 +316,7 @@ async def receiver():
 
         # closing the receiver causes wait_send_all_might_not_block to return
         async with _ForceCloseBoth(await clogged_stream_maker()) as (s, r):
+
             async def sender():
                 try:
                     with assert_checkpoints():