[pypy-svn] r11948 - in pypy/dist/pypy/lib: . test2
hpk at codespeak.net
hpk at codespeak.net
Thu May 5 00:05:22 CEST 2005
Author: hpk
Date: Thu May 5 00:05:22 2005
New Revision: 11948
Added:
pypy/dist/pypy/lib/__init__.py
Removed:
pypy/dist/pypy/lib/test2/support.py
Modified:
pypy/dist/pypy/lib/test2/FIXME_test_sio.py
pypy/dist/pypy/lib/test2/test_binascii_extra.py
pypy/dist/pypy/lib/test2/test_codeccallbacks.py
pypy/dist/pypy/lib/test2/test_file_extra.py
pypy/dist/pypy/lib/test2/test_imp_extra.py
pypy/dist/pypy/lib/test2/test_md5_extra.py
pypy/dist/pypy/lib/test2/test_sha_extra.py
pypy/dist/pypy/lib/test2/test_struct_extra.py
Log:
make pypy.lib plainly importable at cpython level in order
to allow easier testing in pypy/lib/test2
Added: pypy/dist/pypy/lib/__init__.py
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/lib/__init__.py Thu May 5 00:05:22 2005
@@ -0,0 +1 @@
+#
Modified: pypy/dist/pypy/lib/test2/FIXME_test_sio.py
==============================================================================
--- pypy/dist/pypy/lib/test2/FIXME_test_sio.py (original)
+++ pypy/dist/pypy/lib/test2/FIXME_test_sio.py Thu May 5 00:05:22 2005
@@ -5,7 +5,7 @@
import time
from pypy.tool.udir import udir
-sio = support.libmodule("_sio")
+from pypy.lib import _sio as sio
class TSource(object):
Deleted: /pypy/dist/pypy/lib/test2/support.py
==============================================================================
--- /pypy/dist/pypy/lib/test2/support.py Thu May 5 00:05:22 2005
+++ (empty file)
@@ -1,40 +0,0 @@
-import sys, os, new
-
-this_dir = os.path.normpath(os.path.dirname(os.path.abspath(__file__)))
-lib_dir = os.path.dirname(this_dir)
-pypy_dir = os.path.dirname(lib_dir)
-dist_dir = os.path.dirname(pypy_dir)
-
-if dist_dir not in sys.path:
- sys.path.insert(0, dist_dir)
-
-def cleanup_path():
- # the 'pypy/lib' directory should always be last in CPython's sys.path,
- # after the standard library!
- sys.path[:] = [p for p in sys.path
- if os.path.normpath(os.path.abspath(p)) != lib_dir]
-
-cleanup_path()
-sys.path.append(lib_dir)
-
-
-def libmodule(modname):
- """Get a module from the pypy/lib directory, without going through the
- import machinery.
- """
- # forces the real CPython module to be imported first, to avoid strange
- # interactions later
- cleanup_path()
- try:
- cpython_mod = __import__(modname)
- if hasattr(cpython_mod, '__file__'):
- assert os.path.dirname(cpython_mod.__file__) != lib_dir
- except ImportError:
- pass
- cleanup_path()
- sys.path.append(lib_dir)
- filename = os.path.join(lib_dir, modname + '.py')
- mod = new.module(modname)
- mod.__file__ = filename
- execfile(filename, mod.__dict__)
- return mod
Modified: pypy/dist/pypy/lib/test2/test_binascii_extra.py
==============================================================================
--- pypy/dist/pypy/lib/test2/test_binascii_extra.py (original)
+++ pypy/dist/pypy/lib/test2/test_binascii_extra.py Thu May 5 00:05:22 2005
@@ -1,6 +1,5 @@
-import support
-binascii = support.libmodule('binascii')
+from pypy.lib import binascii
def test_uu():
assert binascii.b2a_uu('1234567') == "',3(S-#4V-P \n"
Modified: pypy/dist/pypy/lib/test2/test_codeccallbacks.py
==============================================================================
--- pypy/dist/pypy/lib/test2/test_codeccallbacks.py (original)
+++ pypy/dist/pypy/lib/test2/test_codeccallbacks.py Thu May 5 00:05:22 2005
@@ -1,3 +1,5 @@
+import py
+py.test.skip("this test module doesn't belong here")
import autopath
import test.test_support, unittest
import sys, htmlentitydefs, unicodedata
Modified: pypy/dist/pypy/lib/test2/test_file_extra.py
==============================================================================
--- pypy/dist/pypy/lib/test2/test_file_extra.py (original)
+++ pypy/dist/pypy/lib/test2/test_file_extra.py Thu May 5 00:05:22 2005
@@ -1,6 +1,5 @@
import os
-import support
-_file = support.libmodule("_file")
+from pypy.lib import _file
from pypy.tool.udir import udir
import py
Modified: pypy/dist/pypy/lib/test2/test_imp_extra.py
==============================================================================
--- pypy/dist/pypy/lib/test2/test_imp_extra.py (original)
+++ pypy/dist/pypy/lib/test2/test_imp_extra.py Thu May 5 00:05:22 2005
@@ -1,9 +1,7 @@
-import support
-imp = support.libmodule('imp')
+from pypy.lib import imp
import os
-
def test_find_module():
file, pathname, description = imp.find_module('StringIO')
assert file is not None
Modified: pypy/dist/pypy/lib/test2/test_md5_extra.py
==============================================================================
--- pypy/dist/pypy/lib/test2/test_md5_extra.py (original)
+++ pypy/dist/pypy/lib/test2/test_md5_extra.py Thu May 5 00:05:22 2005
@@ -4,9 +4,8 @@
160 sec. per MB of data on a 233 MHz Intel Pentium CPU.
"""
-import support
import md5 # CPython's implementation in C.
-pymd5 = support.libmodule("md5") # The pure Python implementation.
+from pypy.lib import md5 as pymd5
# Helpers...
Modified: pypy/dist/pypy/lib/test2/test_sha_extra.py
==============================================================================
--- pypy/dist/pypy/lib/test2/test_sha_extra.py (original)
+++ pypy/dist/pypy/lib/test2/test_sha_extra.py Thu May 5 00:05:22 2005
@@ -4,8 +4,7 @@
# Publication 180-1, Secure Hash Standard, 1995 April 17
# http://www.itl.nist.gov/div897/pubs/fip180-1.htm
-import support
-sha = support.libmodule("sha")
+from pypy.lib import sha
class TestSHA:
def check(self, data, digest):
Modified: pypy/dist/pypy/lib/test2/test_struct_extra.py
==============================================================================
--- pypy/dist/pypy/lib/test2/test_struct_extra.py (original)
+++ pypy/dist/pypy/lib/test2/test_struct_extra.py Thu May 5 00:05:22 2005
@@ -1,6 +1,4 @@
-import support
-struct = support.libmodule('struct')
-
+from pypy.lib import struct
def test_simple():
morezeros = '\x00' * (struct.calcsize('l')-4)
More information about the Pypy-commit
mailing list