Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3k
Changeset: r58861:c9689f1bbe61
Date: 2012-11-13 12:05 -0800
http://bitbucket.org/pypy/pypy/changeset/c9689f1bbe61/
Log: long -> integer in error messages
diff --git a/pypy/objspace/std/longobject.py b/pypy/objspace/std/longobject.py
--- a/pypy/objspace/std/longobject.py
+++ b/pypy/objspace/std/longobject.py
@@ -184,10 +184,11 @@
f = w_long1.num.truediv(w_long2.num)
except ZeroDivisionError:
raise OperationError(space.w_ZeroDivisionError,
- space.wrap("long division or modulo by zero"))
+ space.wrap("integer division or modulo by zero"))
except OverflowError:
- raise OperationError(space.w_OverflowError,
- space.wrap("long/long too large for a float"))
+ raise OperationError(
+ space.w_OverflowError,
+ space.wrap("integer division result too large for a float"))
return space.newfloat(f)
def floordiv__Long_Long(space, w_long1, w_long2):
@@ -195,7 +196,7 @@
z = w_long1.num.floordiv(w_long2.num)
except ZeroDivisionError:
raise OperationError(space.w_ZeroDivisionError,
- space.wrap("long division or modulo by zero"))
+ space.wrap("integer division or modulo by zero"))
return newlong(space, z)
def div__Long_Long(space, w_long1, w_long2):
@@ -206,7 +207,7 @@
z = w_long1.num.mod(w_long2.num)
except ZeroDivisionError:
raise OperationError(space.w_ZeroDivisionError,
- space.wrap("long division or modulo by zero"))
+ space.wrap("integer division or modulo by zero"))
return newlong(space, z)
def divmod__Long_Long(space, w_long1, w_long2):
@@ -214,7 +215,7 @@
div, mod = w_long1.num.divmod(w_long2.num)
except ZeroDivisionError:
raise OperationError(space.w_ZeroDivisionError,
- space.wrap("long division or modulo by zero"))
+ space.wrap("integer division or modulo by zero"))
return space.newtuple([newlong(space, div), newlong(space, mod)])
def pow__Long_Long_Long(space, w_long1, w_long2, w_long3):
@@ -236,7 +237,7 @@
if w_long2.num.sign < 0:
raise FailedToImplementArgs(
space.w_ValueError,
- space.wrap("long pow() too negative"))
+ space.wrap("int pow() too negative"))
return W_LongObject(w_long1.num.pow(w_long2.num, None))
def neg__Long(space, w_long1):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
