-

cool-RR · cool-RR · commit 848be93915df · 2013-09-18T22:04:15.000+03:00
diff --git a/README.markdown b/README.markdown
@@ -38,8 +38,6 @@ Python Toolbox is at version 0.6.0, which is an alpha release. It's being used i
 
 ## Next tasks ##
 
-Making Python Toolbox support Python 3.x, and the packaging arrangements necessary.
-
 Adding more useful tools.
 
 ## Future ##
diff --git a/source_py3/python_toolbox/cute_iter_tools.py b/source_py3/python_toolbox/cute_iter_tools.py
@@ -30,8 +30,7 @@ def iterate_overlapping_subsequences(iterable, length=2, wrap_around=False):
     2, 3), (2, 3, 0), (3, 0, 1)]`.
     '''
     if length == 1:
-        for item in iterable:
-            yield item
+        yield from iterable
     
     assert length >= 2
     
@@ -79,8 +78,7 @@ def shorten(iterable, n):
     '''
 
     if n == infinity:
-        for thing in iterable:
-            yield thing
+        yield from iterable
         raise StopIteration
     
     assert isinstance(n, int)
@@ -196,8 +194,7 @@ def sentinel(counter=([fill_value] * (len(iterables) - 1)).pop):
     iterables = [itertools.chain(iterable, sentinel(), fillers) for iterable
                  in iterables]
     try:
-        for tuple_ in zip(*iterables):
-            yield tuple_
+        yield from zip(*iterables)
     except IndexError:
         raise StopIteration
 
diff --git a/source_py3/python_toolbox/queue_tools.py b/source_py3/python_toolbox/queue_tools.py
@@ -40,8 +40,7 @@ def iterate(queue, block=False, limit_to_original_size=False,
            not _platform_supports_multiprocessing_qsize():
             
             if _prefetch_if_no_qsize:
-                for item in dump(queue):
-                    yield item
+                yield from dump(queue)
                 raise StopIteration
             raise NotImplementedError(
                 "This platform doesn't support `qsize` for `multiprocessing` "
diff --git a/source_py3/python_toolbox/sequence_tools.py b/source_py3/python_toolbox/sequence_tools.py
@@ -58,8 +58,7 @@ def combinations(sequence, n=None, start=0):
         length = len(sequence) - start
         iterators = (combinations(sequence, n=i, start=start) for i
                      in range(1, length + 1))
-        for item in itertools.chain(*iterators):
-            yield item
+        yield from itertools.chain(*iterators)
 
     elif n == 1:
         for thing in itertools.islice(sequence, start, None):
diff --git a/source_py3/python_toolbox/sys_tools.py b/source_py3/python_toolbox/sys_tools.py
@@ -47,9 +47,8 @@ def __init__(self, stdout=True, stderr=True):
         
     def manage_context(self):
         '''Manage the `OutputCapturer`'s context.'''
-        with self._stdout_temp_setter:
-            with self._stderr_temp_setter:
-                yield self
+        with self._stdout_temp_setter, self._stderr_temp_setter:
+            yield self
         
     output = property(lambda self: self.string_io.getvalue(),
                       doc='''The string of output that was captured.''')
diff --git a/source_py3/test_python_toolbox/test_cute_iter_tools/test_shorten.py b/source_py3/test_python_toolbox/test_cute_iter_tools/test_shorten.py
@@ -32,9 +32,7 @@ def test():
 def test_dont_pull_extra_item():
     '''Test that `shorten` doesn't pull an extra member from the iterable.'''
     def generator():
-        yield 1
-        yield 2
-        yield 3
+        yield from [1, 2, 3]
         raise Exception
 
     nose.tools.assert_raises(Exception, lambda: list(generator()))
diff --git a/source_py3/test_python_toolbox/test_persistent/test_cross_process_persistent.py b/source_py3/test_python_toolbox/test_persistent/test_cross_process_persistent.py
@@ -44,14 +44,11 @@ def test():
     checkers = [_check_deepcopying, _check_process_passing]
     cross_process_persistent_classes = [A, CrossProcessPersistent]
     
-    iterator = cute_iter_tools.product(
+    yield from cute_iter_tools.product(
         checkers,
         cross_process_persistent_classes,
     )
     
-    for checker, cross_process_persistent_class in iterator:
-        yield checker, cross_process_persistent_class
-    
         
 def _check_deepcopying(cross_process_persistent_class):
     '''Test that CPPs maintain their identities when faux-deepcopied.'''
