Commits

Philip Jenvey  committed bfeb762

int -> long

  • Participants
  • Parent commits 7aecd86
  • Branches py3k

Comments (0)

Files changed (2)

File pypy/objspace/std/longtype.py

                 w_obj = space.int(w_obj)
             else:
                 raise operationerrfmt(space.w_TypeError,
-                    "long() argument must be a string or a number, not '%T'",
+                    "int() argument must be a string or a number, not '%T'",
                     w_obj)
             if space.is_w(w_longtype, space.w_int):
                 return w_obj
                 s = strval.decode('latin-1')
             except OperationError:
                 raise OperationError(space.w_TypeError,
-                                     space.wrap("long() can't convert non-string "
+                                     space.wrap("int() can't convert non-string "
                                                 "with explicit base"))
         return string_to_w_long(space, w_longtype, s, base)
 

File pypy/objspace/std/test/test_longobject.py

         assert int(A(13)) == 42
 
     def test_long_error_msg(self):
-        e = raises(TypeError, long, [])
+        e = raises(TypeError, int, [])
         assert str(e.value) == (
-            "long() argument must be a string or a number, not 'list'")
+            "int() argument must be a string or a number, not 'list'")
 
     def test_large_identity(self):
         import sys