revert our yield from stdlib patches

Author: timfel

graalpython/lib-python/3/glob.py

@@ -50,13 +50,9 @@ def _iglob(pathname, recursive, dironly):
         return
     if not dirname:
         if recursive and _isrecursive(basename):
-            # yield from _glob2(dirname, basename, dironly)
-            # TRUFFLE TODO: revert
-            for __x in _glob2(dirname, basename, dironly): yield __x
+            yield from _glob2(dirname, basename, dironly)
         else:
-            # yield from _glob1(dirname, basename, dironly)
-            # TRUFFLE TODO: revert
-            for __x in _glob1(dirname, basename, dironly): yield __x
+            yield from _glob1(dirname, basename, dironly)
         return
     # `os.path.split()` returns the argument itself as a dirname if it is a
     # drive or UNC path.  Prevent an infinite recursion if a drive or UNC path
@@ -111,9 +107,7 @@ def glob1(dirname, pattern):
 def _glob2(dirname, pattern, dironly):
     assert _isrecursive(pattern)
     yield pattern[:0]
-    # yield from _rlistdir(dirname, dironly)
-    # TRUFFLE TODO: revert
-    for __x in _rlistdir(dirname, dironly): yield __x
+    yield from _rlistdir(dirname, dironly)
 
 # If dironly is false, yields all file names inside a directory.
 # If dironly is true, yields only directory names.

graalpython/lib-python/3/os.py

@@ -406,15 +406,11 @@ def walk(top, topdown=True, onerror=None, followlinks=False):
             # the caller can replace the directory entry during the "yield"
             # above.
             if followlinks or not islink(new_path):
-                # TRUFFLE TODO: revert
-                # yield from walk(new_path, topdown, onerror, followlinks)
-                for __x, __y, __z in walk(new_path, topdown, onerror, followlinks): yield __x, __y, __z
+                yield from walk(new_path, topdown, onerror, followlinks)
     else:
         # Recurse into sub-directories
         for new_path in walk_dirs:
-            # TRUFFLE TODO: revert
-            # yield from walk(new_path, topdown, onerror, followlinks)
-            for __x, __y, __z in walk(new_path, topdown, onerror, followlinks): yield __x, __y, __z
+            yield from walk(new_path, topdown, onerror, followlinks)
         # Yield after recursion if going bottom up
         yield top, dirs, nondirs
 

graalpython/lib-python/3/traceback.py

@@ -588,17 +588,13 @@ def format(self, *, chain=True):
         """
         if chain:
             if self.__cause__ is not None:
-                # TRUFFLE TODO(ls): revert this loop to "yield from"
-                for __x in self.__cause__.format(chain=chain): yield __x
+                yield from self.__cause__.format(chain=chain)
                 yield _cause_message
             elif (self.__context__ is not None and
                 not self.__suppress_context__):
-                # TRUFFLE TODO(ls): revert this loop to "yield from"
-                for __x in self.__context__.format(chain=chain): yield __x
+                yield from self.__context__.format(chain=chain)
                 yield _context_message
         if self.exc_traceback is not None:
             yield 'Traceback (most recent call last):\n'
-        # TODO(ls): revert this loop to "yield from"
-        for __x in self.stack.format(): yield __x
-        # TODO(ls): revert this loop to "yield from"
-        for __x in self.format_exception_only(): yield __x
+        yield from self.stack.format()
+        yield from self.format_exception_only()