[pypy-svn] commit/pypy: 2 new changesets

[Bitbucket]

2 new changesets in pypy:

http://bitbucket.org/pypy/pypy/changeset/ef64987d85e0/
changeset:   r40054:ef64987d85e0
user:        amauryfa
date:        2010-12-15 15:05:03
summary:     A fix for https://bitbucket.org/hpk42/py/issue/2
which is needed because "hg" is a .cmd script on Windows
affected #:  2 files (8 bytes)

--- a/py/_path/local.py	Wed Dec 15 16:06:17 2010 +0100
+++ b/py/_path/local.py	Wed Dec 15 15:05:03 2010 +0100
@@ -589,7 +589,7 @@
                 else:
                     paths = [re.sub('%SystemRoot%', systemroot, path)
                              for path in paths]
-                tryadd = '', '.exe', '.com', '.bat' # XXX add more?
+                tryadd = '', '.exe', '.com', '.bat', '.cmd' # XXX add more?
             else:
                 paths = py.std.os.environ['PATH'].split(':')
                 tryadd = ('',)


--- a/pypy/module/test_lib_pypy/ctypes_tests/conftest.py	Wed Dec 15 16:06:17 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-import py
-import sys
-
-def pytest_ignore_collect(path):
-    if '__pypy__' not in sys.builtin_module_names:
-        return True
-
-def compile_so_file():
-    from pypy.translator.platform import platform
-    from pypy.translator.tool.cbuild import ExternalCompilationInfo
-    udir = py.test.ensuretemp('_ctypes_test')
-    cfile = py.path.local(__file__).dirpath().join("_ctypes_test.c")
-
-    if sys.platform == 'win32':
-        libraries = ['oleaut32']
-    else:
-        libraries = []
-    eci = ExternalCompilationInfo(libraries=libraries)
-
-    return platform.compile([cfile], eci, str(udir.join('_ctypes_test')),
-                            standalone=False)
-
-def pytest_configure(config):
-    global sofile
-    sofile = compile_so_file()


http://bitbucket.org/pypy/pypy/changeset/ee8e4566ef0f/
changeset:   r40055:ee8e4566ef0f
user:        amauryfa
date:        2010-12-16 11:52:10
summary:     merge heads
affected #:  0 files (0 bytes)

--- a/py/_path/local.py	Thu Dec 16 10:01:46 2010 +0100
+++ b/py/_path/local.py	Thu Dec 16 11:52:10 2010 +0100
@@ -589,7 +589,7 @@
                 else:
                     paths = [re.sub('%SystemRoot%', systemroot, path)
                              for path in paths]
-                tryadd = '', '.exe', '.com', '.bat' # XXX add more?
+                tryadd = '', '.exe', '.com', '.bat', '.cmd' # XXX add more?
             else:
                 paths = py.std.os.environ['PATH'].split(':')
                 tryadd = ('',)

Repository URL: https://bitbucket.org/pypy/pypy/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.