[pypy-commit] pypy default: hg backout e83ef97376fe: wrong fix

[arigo]

Author: Armin Rigo <ar...@tunes.org>
Branch: 
Changeset: r78399:3bb6c8ee92a4
Date: 2015-07-02 09:57 +0200
http://bitbucket.org/pypy/pypy/changeset/3bb6c8ee92a4/

Log:    hg backout e83ef97376fe: wrong fix

diff --git a/pypy/module/imp/importing.py b/pypy/module/imp/importing.py
--- a/pypy/module/imp/importing.py
+++ b/pypy/module/imp/importing.py
@@ -349,11 +349,9 @@
                 w_all = try_getattr(space, w_mod, space.wrap('__all__'))
                 if w_all is not None:
                     fromlist_w = space.fixedview(w_all)
-            else:
-                # this only runs if fromlist_w != ['*']
-                for w_name in fromlist_w:
-                    if try_getattr(space, w_mod, w_name) is None:
-                        return None
+            for w_name in fromlist_w:
+                if try_getattr(space, w_mod, w_name) is None:
+                    return None
         return w_mod
     return first
 
@@ -391,12 +389,10 @@
                 w_all = try_getattr(space, w_mod, w('__all__'))
                 if w_all is not None:
                     fromlist_w = space.fixedview(w_all)
-            else:
-                # this only runs if fromlist_w != ['*']
-                for w_name in fromlist_w:
-                    if try_getattr(space, w_mod, w_name) is None:
-                        load_part(space, w_path, prefix, space.str0_w(w_name),
-                                  w_mod, tentative=1)
+            for w_name in fromlist_w:
+                if try_getattr(space, w_mod, w_name) is None:
+                    load_part(space, w_path, prefix, space.str0_w(w_name),
+                              w_mod, tentative=1)
         return w_mod
     else:
         return first
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit