1. Pypy
  2. Untitled project
  3. pypy

Commits

Amaury Forgeot d'Arc  committed 9824a8b

Fix remaining failures in module/exception

  • Participants
  • Parent commits f01df61
  • Branches py3k

Comments (0)

Files changed (2)

File pypy/module/exceptions/test/test_exc.py

View file
  • Ignore whitespace
         assert ud.reason == 'bah'
         assert ud.args == ('x', b'y', 1, 5, 'bah')
         assert ud.message == ''
-        ud.object = 'z9'
-        assert ud.object == 'z9'
+        ud.object = b'z9'
+        assert ud.object == b'z9'
         assert str(ud) == "'x' codec can't decode bytes in position 1-4: bah"
         ud.end = 2
         assert str(ud) == "'x' codec can't decode byte 0x39 in position 1: bah"

File pypy/objspace/std/typeobject.py

View file
  • Ignore whitespace
             # hack...
             if ('__module__' in w_self.dict_w and
                 space.isinstance_w(w_self.getdictvalue(space, '__module__'),
-                                               space.w_str)):
+                                               space.w_unicode)):
                 return w_self.getdictvalue(space, '__module__')
             return space.wrap('__builtin__')