[pypy-commit] pypy py3k: merge default

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r65504:92b54ee3d6f2
Date: 2013-07-19 19:14 -0700
http://bitbucket.org/pypy/pypy/changeset/92b54ee3d6f2/

Log:	merge default

diff --git a/pypy/module/test_lib_pypy/support.py b/pypy/module/test_lib_pypy/support.py
--- a/pypy/module/test_lib_pypy/support.py
+++ b/pypy/module/test_lib_pypy/support.py
@@ -24,7 +24,7 @@
         # overshadows it
         w_mod = space.appexec([], "(): import %s; return %s" % (name, name))
     except OperationError as e:
-        if skipmsg is not None or not e.match(space, space.w_ImportError):
+        if skipmsg is None or not e.match(space, space.w_ImportError):
             raise
         py.test.skip('%s (%s))' % (skipmsg, str(e)))
     w_file = space.getattr(w_mod, space.wrap('__file__'))