Author: Christian Tismer <[email protected]>
Branch: win64-stage1
Changeset: r49977:0145566e0b02
Date: 2011-11-29 20:34 +0100
http://bitbucket.org/pypy/pypy/changeset/0145566e0b02/
Log: reverted a bad import of pypy into app_operator
diff --git a/pypy/module/operator/app_operator.py
b/pypy/module/operator/app_operator.py
--- a/pypy/module/operator/app_operator.py
+++ b/pypy/module/operator/app_operator.py
@@ -5,8 +5,6 @@
equivalent to x+y.
'''
from __pypy__ import builtinify
-from pypy.rlib.rarithmetic import is_valid_int
-
def countOf(a,b):
'countOf(a, b) -- Return the number of times b occurs in a.'
@@ -55,7 +53,7 @@
def repeat(obj, num):
'repeat(a, b) -- Return a * b, where a is a sequence, and b is an integer.'
- if not is_valid_int(num):
+ if not isinstance(num, (int, long)):
raise TypeError, 'an integer is required'
if not isSequenceType(obj):
raise TypeError, "non-sequence object can't be repeated"
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
