Catch the StopIteration that result from PEP-479 or add default value in ``next`` (#1081)

* Catch the StopIteration that result from PEP-479

StopIteration exceptions raised directly or indirectly in coroutines
and generators are transformed into RuntimeError exceptions for python
3.7+.

1 files changed, 15 insertions, 15 deletions

diff --git a/astroid/decorators.py b/astroid/decorators.py
index 81bc7d62..7d029120 100644
--- a/astroid/decorators.py
+++ b/astroid/decorators.py
@@ -95,21 +95,22 @@ def path_wrapper(func):
 
         yielded = set()
         generator = _func(node, context, **kwargs)
-        try:
-            while True:
+        while True:
+            try:
                 res = next(generator)
-                # unproxy only true instance, not const, tuple, dict...
-                if res.__class__.__name__ == "Instance":
-                    ares = res._proxied
-                else:
-                    ares = res
-                if ares not in yielded:
-                    yield res
-                    yielded.add(ares)
-        except StopIteration as error:
-            if error.args:
-                return error.args[0]
-            return None
+            except StopIteration as error:
+                if error.args:
+                    return error.args[0]
+                return None
+
+            # unproxy only true instance, not const, tuple, dict...
+            if res.__class__.__name__ == "Instance":
+                ares = res._proxied
+            else:
+                ares = res
+            if ares not in yielded:
+                yield res
+                yielded.add(ares)
 
     return wrapped
 
@@ -131,7 +132,6 @@ def yes_if_nothing_inferred(func, instance, args, kwargs):
 @wrapt.decorator
 def raise_if_nothing_inferred(func, instance, args, kwargs):
     generator = func(*args, **kwargs)
-
     try:
         yield next(generator)
     except StopIteration as error: