[pypy-commit] pypy default: simplify

pjenvey noreply at buildbot.pypy.org
Sat May 18 23:14:16 CEST 2013


Author: Philip Jenvey <pjenvey at underboss.org>
Branch: 
Changeset: r64288:3e8ddc62dedc
Date: 2013-05-18 14:10 -0700
http://bitbucket.org/pypy/pypy/changeset/3e8ddc62dedc/

Log:	simplify

diff --git a/pypy/objspace/std/dictmultiobject.py b/pypy/objspace/std/dictmultiobject.py
--- a/pypy/objspace/std/dictmultiobject.py
+++ b/pypy/objspace/std/dictmultiobject.py
@@ -1259,13 +1259,7 @@
 
 def _all_contained_in(space, w_dictview, w_other):
     w_iter = space.iter(w_dictview)
-    while True:
-        try:
-            w_item = space.next(w_iter)
-        except OperationError, e:
-            if not e.match(space, space.w_StopIteration):
-                raise
-            break
+    for w_item in space.iteriterable(w_iter):
         if not space.is_true(space.contains(w_other, w_item)):
             return space.w_False
     return space.w_True


More information about the pypy-commit mailing list