Author: Richard Plangger <planri...@gmail.com>
Branch: s390x-backend
Changeset: r80845:ec399b39378a
Date: 2015-11-23 08:22 +0100
http://bitbucket.org/pypy/pypy/changeset/ec399b39378a/

Log:    merged default

diff --git a/rpython/annotator/model.py b/rpython/annotator/model.py
--- a/rpython/annotator/model.py
+++ b/rpython/annotator/model.py
@@ -461,7 +461,10 @@
 
     def intersection(self, other):
         assert isinstance(other, SomeExceptCase)
-        classdefs = {c for c in self.classdefs if c.issubclass(other.case)}
+        classdefs = set()
+        for c in self.classdefs:
+            if c.issubclass(other.case):
+                classdefs.add(c)
         if classdefs:
             return SomeException(classdefs)
         else:
@@ -469,7 +472,10 @@
 
     def difference(self, other):
         assert isinstance(other, SomeExceptCase)
-        classdefs = {c for c in self.classdefs if not c.issubclass(other.case)}
+        classdefs = set()
+        for c in self.classdefs:
+            if not c.issubclass(other.case):
+                classdefs.add(c)
         if classdefs:
             return SomeException(classdefs)
         else:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to