Commits

Philip Jenvey  committed 92b54ee Merge

merge default

  • Participants
  • Parent commits 897dfe5, 4121d8d
  • Branches py3k

Comments (0)

Files changed (1)

File pypy/module/test_lib_pypy/support.py

         # 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__'))