[pypy-commit] pypy win64-stage1: removed some unintentional changes (is_valid_int is wrong in applevel)
ctismer
noreply at buildbot.pypy.org
Sat Mar 17 01:08:54 CET 2012
Author: Christian Tismer <tismer at stackless.com>
Branch: win64-stage1
Changeset: r53739:3c92eeb998e5
Date: 2012-03-16 17:05 -0700
http://bitbucket.org/pypy/pypy/changeset/3c92eeb998e5/
Log: removed some unintentional changes (is_valid_int is wrong in
applevel)
diff --git a/pypy/module/micronumpy/test/test_ufuncs.py b/pypy/module/micronumpy/test/test_ufuncs.py
--- a/pypy/module/micronumpy/test/test_ufuncs.py
+++ b/pypy/module/micronumpy/test/test_ufuncs.py
@@ -1,4 +1,4 @@
-from pypy.rlib.rarithmetic import is_valid_int
+
from pypy.module.micronumpy.test.test_base import BaseNumpyAppTest
@@ -142,7 +142,7 @@
x = maximum(2, 3)
assert x == 3
- assert is_valid_int(x)
+ assert isinstance(x, (int, long))
def test_multiply(self):
from _numpypy import array, multiply
diff --git a/pypy/module/posix/test/test_posix2.py b/pypy/module/posix/test/test_posix2.py
--- a/pypy/module/posix/test/test_posix2.py
+++ b/pypy/module/posix/test/test_posix2.py
@@ -7,8 +7,6 @@
from pypy.conftest import gettestobjspace
from pypy.tool.autopath import pypydir
from pypy.rpython.module.ll_os import RegisterOs
-from pypy.rlib.rarithmetic import is_valid_int
-
import os
import py
import sys
@@ -150,7 +148,7 @@
posix.stat_float_times(False)
st = posix.stat(path)
- assert is_valid_int(st.st_mtime)
+ assert isinstance(st.st_mtime, (int, long))
assert st[7] == st.st_atime
finally:
posix.stat_float_times(current)
More information about the pypy-commit
mailing list