Changeset a505021 for tests/pybin/tools.py

Timestamp:

Feb 21, 2020, 3:36:36 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

c7a900a

Parents:

8c50aed (diff), c744563a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into park_unpark

File:

• tests/pybin/tools.py (modified) (2 diffs)

tests/pybin/tools.py

@@ -175 +175 @@
 
 def which(program):
-    fpath, fname = os.path.split(program)
-    if fpath:
-        if is_exe(program):
-            return program
-    else:
-        for path in os.environ["PATH"].split(os.pathsep):
-            exe_file = os.path.join(path, program)
-            if is_exe(exe_file):
-                return exe_file
-
-    return None
+        fpath, fname = os.path.split(program)
+        if fpath:
+                if is_exe(program):
+                        return program
+        else:
+                for path in os.environ["PATH"].split(os.pathsep):
+                        exe_file = os.path.join(path, program)
+                        if is_exe(exe_file):
+                                return exe_file
+        return None
 
 @contextlib.contextmanager
@@ -365 +364 @@
 
 class Timed:
-    def __enter__(self):
-        self.start = time.time()
-        return self
-
-    def __exit__(self, *args):
-        self.end = time.time()
-        self.duration = self.end - self.start
+        def __enter__(self):
+                self.start = time.time()
+                return self
+
+        def __exit__(self, *args):
+                self.end = time.time()
+                self.duration = self.end - self.start
 
 def timed(src, timeout):
         expire = time.time() + timeout
         i = iter(src)
-        while True:
-                yield i.next(max(expire - time.time(), 0))
+        with contextlib.suppress(StopIteration):
+                while True:
+                        yield i.next(max(expire - time.time(), 0))