Sourcery refactored CPython37 branch

doctest_generated/test_descrtut.py

@@ -30,7 +30,7 @@ def getx(self):
             return self.__x
 
         def setx(self, x):
-            if x < 0: x = 0
+            x = max(x, 0)
             self.__x = x
 
         x = property(getx, setx)
@@ -99,7 +99,7 @@ def __init__(self):
         def getx(self):
             return self.__x
         def setx(self, x):
-            if x < 0: x = 0
+            x = max(x, 0)
             self.__x = x
         x = property(getx, setx)
     #

doctest_generated/test_generators.py

@@ -4,7 +4,7 @@
 
 try:
     def firstn(g, n):
-        return [next(g) for i in range(n)]
+        return [next(g) for _ in range(n)]
     #
     def intsfrom(i):
         while 1:
@@ -48,8 +48,7 @@ def sieve(ints):
         prime = next(ints)
         yield prime
         not_divisible_by_prime = exclude_multiples(prime, ints)
-        for p in sieve(not_divisible_by_prime):
-            yield p
+        yield from sieve(not_divisible_by_prime)
     #
 except Exception as __e:
     print("Occurred", type(__e), __e)
@@ -114,10 +113,9 @@ def m235():
         me_times2 = times(2, m235())
         me_times3 = times(3, m235())
         me_times5 = times(5, m235())
-        for i in merge(merge(me_times2,
+        yield from merge(merge(me_times2,
                              me_times3),
-                       me_times5):
-            yield i
+                       me_times5)
     #
     # Don't print "too many" of these -- the implementation above is extremely
     # inefficient:  each call of m235() leads to 3 recursive calls, and in
@@ -167,10 +165,9 @@ def m235():
         me_times2 = times(2, m235)
         me_times3 = times(3, m235)
         me_times5 = times(5, m235)
-        for i in merge(merge(me_times2,
+        yield from merge(merge(me_times2,
                              me_times3),
-                       me_times5):
-            yield i
+                       me_times5)
     #
     # Print as many of these as you like -- *this* implementation is memory-
     # efficient.
@@ -205,8 +202,7 @@ def sum(g, h):
 
         def tail(g):
             next(g)    # throw first away
-            for x in g:
-                yield x
+            yield from g
 
         yield a
         yield b
@@ -243,10 +239,9 @@ def tail(g):
     def m235():
         def _m235():
             yield 1
-            for n in merge(times(2, m2),
+            yield from merge(times(2, m2),
                            merge(times(3, m3),
-                                 times(5, m5))):
-                yield n
+                                 times(5, m5)))
         m1 = _m235()
         m2, m3, m5, mRes = tee(m1, 4)
         return mRes
@@ -291,8 +286,7 @@ def _fib():
             yield 1
             yield 2
             next(fibTail) # throw first away
-            for res in _isum(fibHead, fibTail):
-                yield res
+            yield from _isum(fibHead, fibTail)
 
         realfib = _fib()
         fibHead, fibTail, fibRes = tee(realfib, 3)
@@ -450,8 +444,7 @@ def gencopy(iterator):
 
 try:
     def g():
-        i = next(me)
-        yield i
+        yield next(me)
 except Exception as __e:
     print("Occurred", type(__e), __e)
 
@@ -618,11 +611,9 @@ def tree(list):
 try:
     def inorder(t):
         if t:
-            for x in inorder(t.left):
-                yield x
+            yield from inorder(t.left)
             yield t.label
-            for x in inorder(t.right):
-                yield x
+            yield from inorder(t.right)
     #
 except Exception as __e:
     print("Occurred", type(__e), __e)
@@ -637,7 +628,7 @@ def inorder(t):
 
 try:
     def g():
-        for i in range(3):
+        for _ in range(3):
             yield None
         yield None
         return
@@ -691,8 +682,7 @@ def gcomb(x, k):
                 c.insert(0, first)
                 yield c
             # If it doesn't contain first, it's a k comb of rest.
-            for c in gcomb(rest, k):
-                yield c
+            yield from gcomb(rest, k)
     #
 except Exception as __e:
     print("Occurred", type(__e), __e)
@@ -860,8 +850,7 @@ def __init__(self, name):
         def generate(self):
             while not self.parent:
                 yield self
-            for x in self.parent.generator:
-                yield x
+            yield from self.parent.generator
 
         def find(self):
             return next(self.generator)
@@ -922,12 +911,11 @@ def f():
     #
     def f():
         try:
-            try:
-                1//0
-            except ZeroDivisionError:
-                yield 666
-            except:
-                pass
+            1//0
+        except ZeroDivisionError:
+            yield 666
+        except:
+            pass
         finally:
             pass
     #
@@ -976,8 +964,7 @@ def f():
 
 try:
     def f():
-       if 0:
-           yield
+        pass
 except Exception as __e:
     print("Occurred", type(__e), __e)
 
@@ -993,8 +980,7 @@ def f():
 
 try:
     def f():
-        if 0:
-            yield 1
+        pass
 except Exception as __e:
     print("Occurred", type(__e), __e)
 
@@ -1010,8 +996,7 @@ def f():
 
 try:
     def f():
-       if "":
-           yield None
+        pass
 except Exception as __e:
     print("Occurred", type(__e), __e)
 
@@ -1028,25 +1013,6 @@ def f():
 try:
     def f():
         return
-        try:
-            if x==4:
-                pass
-            elif 0:
-                try:
-                    1//0
-                except SyntaxError:
-                    pass
-                else:
-                    if 0:
-                        while 12:
-                            x += 1
-                            yield 2 # don't blink
-                            f(a, b, c, d, e)
-            else:
-                pass
-        except:
-            x = 1
-        return
 except Exception as __e:
     print("Occurred", type(__e), __e)
 
@@ -1101,10 +1067,7 @@ def f(self):
 
 try:
     def f():
-        if 0:
-            return
-        if 0:
-            yield 2
+        pass
 except Exception as __e:
     print("Occurred", type(__e), __e)
 
@@ -1315,7 +1278,6 @@ def f():
     def f():
         yield 1
         return
-        yield 2 # never reached
 except Exception as __e:
     print("Occurred", type(__e), __e)
 
@@ -1412,8 +1374,7 @@ def g3():
 
 try:
     def yrange(n):
-        for i in range(n):
-            yield i
+        yield from range(n)
 except Exception as __e:
     print("Occurred", type(__e), __e)
 
@@ -1451,8 +1412,7 @@ def caller():
 
 try:
     def zrange(n):
-        for i in yrange(n):
-            yield i
+        yield from yrange(n)
 except Exception as __e:
     print("Occurred", type(__e), __e)
 
@@ -1661,7 +1621,8 @@ def f(): yield
 
 
 try:
-    def f(): list(i for i in [(yield 26)])
+    def f():
+        list([(yield 26)])
 except Exception as __e:
     print("Occurred", type(__e), __e)
 

doctest_generated/test_genexps.py

@@ -10,17 +10,15 @@
 
 try:
     print('Line 8')
-    print(list((i,j) for i in range(3) for j in range(4) )
-    )
+    print([(i,j) for i in range(3) for j in range(4)])
 
 except Exception as __e:
     print("Occurred", type(__e), __e)
 
 
 try:
     print('Line 14')
-    print(list((i,j) for i in range(4) for j in range(i) )
-    )
+    print([(i,j) for i in range(4) for j in range(i)])
 
 except Exception as __e:
     print("Occurred", type(__e), __e)
@@ -34,8 +32,7 @@
 
 try:
     print('Line 21')
-    print(sum(i*i for i in range(100))
-    )
+    print(sum(i**2 for i in range(100)))
 
 except Exception as __e:
     print("Occurred", type(__e), __e)
@@ -51,7 +48,7 @@
 
 
 try:
-    g = (i*i for i in range(4))
+    g = (i**2 for i in range(4))
 except Exception as __e:
     print("Occurred", type(__e), __e)
 
@@ -75,7 +72,7 @@
 
 
 try:
-    g = (i*i for i in range(3))
+    g = (i**2 for i in range(3))
 except Exception as __e:
     print("Occurred", type(__e), __e)
 
@@ -338,8 +335,7 @@ def caller():
 
 try:
     def zrange(n):
-        for i in yrange(n):
-            yield i
+        yield from yrange(n)
 except Exception as __e:
     print("Occurred", type(__e), __e)
 

doctest_generated/test_itertools.py

@@ -216,13 +216,12 @@ def unique_everseen(iterable, key=None):
         # unique_everseen('ABBCcAD', str.lower) --> A B C D
         seen = set()
         seen_add = seen.add
-        if key is None:
-            for element in iterable:
+        for element in iterable:
+            if key is None:
                 if element not in seen:
                     seen_add(element)
                     yield element
-        else:
-            for element in iterable:
+            else:
                 k = key(element)
                 if k not in seen:
                     seen_add(k)

doctest_generated/test_listcomps.py

@@ -1,8 +1,7 @@
 
 try:
     print('Line 4')
-    print(sum([i*i for i in range(100) if i&1 == 1])
-    )
+    print(sum(i*i for i in range(100) if i&1 == 1))
 
 except Exception as __e:
     print("Occurred", type(__e), __e)
@@ -34,8 +33,7 @@
 
 try:
     print('Line 23')
-    print(sum([i*i for i in range(100)])
-    )
+    print(sum(i**2 for i in range(100)))
 
 except Exception as __e:
     print("Occurred", type(__e), __e)
@@ -52,7 +50,7 @@
 
 try:
     def frange(n):
-        return [i for i in range(n)]
+        return list(range(n))
 except Exception as __e:
     print("Occurred", type(__e), __e)
 
@@ -83,8 +81,7 @@ def frange(n):
 
 try:
     def grange(n):
-        for x in [i for i in range(n)]:
-            yield x
+        yield from list(range(n))
 except Exception as __e:
     print("Occurred", type(__e), __e)
 
@@ -233,7 +230,7 @@ def test_func():
 
 try:
     def test_func():
-        items = [(lambda: y) for i in range(5)]
+        items = [lambda: y for _ in range(5)]
         y = 2
         return [x() for x in items]
 except Exception as __e: