Improve detection of just-started generator

cjrh · Oct 23, 2021 · bbd6079 · bbd6079
1 parent deea651
commit bbd6079
Showing 1 changed file with 8 additions and 16 deletions.
diff --git a/excitertools.py b/excitertools.py
@@ -3814,15 +3814,11 @@ def send(self, collector: Generator, close_collector_when_done=False) -> "None":
         Note that Iter.send_ is a sink, so no further chaining is allowed.
 
         """
+        if inspect.getgeneratorstate(collector) == 'GEN_CREATED':
+            next(collector)
+
         for v in self:
-            try:
-                collector.send(v)
-            except TypeError as e:
-                if "just-started generator" in str(e):
-                    next(collector)
-                    collector.send(v)
-                else:  # pragma: no cover
-                    raise
+            collector.send(v) 
 
         if close_collector_when_done:
             collector.close()
@@ -3875,14 +3871,10 @@ def send_also(self, collector: Generator) -> "Iter":
 
         """
         def func(v):
-            try:
-                collector.send(v)
-            except TypeError as e:
-                if "just-started generator" in str(e):
-                    next(collector)
-                    collector.send(v)
-                else:  # pragma: no cover
-                    raise
+            if inspect.getgeneratorstate(collector) == 'GEN_CREATED':
+                next(collector)
+
+            collector.send(v)
 
         return self.side_effect(func)