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

[Bitbucket]

2 new changesets in pypy:

http://bitbucket.org/pypy/pypy/changeset/ab339d462fda/
changeset:   r40056:ab339d462fda
user:        arigo
date:        2010-12-16 11:53:08
summary:     Put back conftest.py in test/.  Fix for py.test -A.  Don't ask me the details, I don't know them.
affected #:  2 files (462 bytes)

--- a/pypy/module/cpyext/conftest.py	Thu Dec 16 10:01:46 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-import py
-from pypy.conftest import option, gettestobjspace
-
-def pytest_ignore_collect(path, config):
-    if config.option.runappdirect:
-        return True # "cannot be run by py.test -A"
-    # ensure additional functions are registered
-    import pypy.module.cpyext.test.test_cpyext
-    return False
-
-def pytest_funcarg__space(request):
-    return gettestobjspace(usemodules=['cpyext', 'thread'])
-
-def pytest_funcarg__api(request):
-    return request.cls.api
-


--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pypy/module/cpyext/test/conftest.py	Thu Dec 16 11:53:08 2010 +0100
@@ -0,0 +1,16 @@
+import py
+from pypy.conftest import option, gettestobjspace
+
+def pytest_ignore_collect(path, config):
+    if config.option.runappdirect:
+        return True # "cannot be run by py.test -A"
+    # ensure additional functions are registered
+    import pypy.module.cpyext.test.test_cpyext
+    return False
+
+def pytest_funcarg__space(request):
+    return gettestobjspace(usemodules=['cpyext', 'thread'])
+
+def pytest_funcarg__api(request):
+    return request.cls.api
+


http://bitbucket.org/pypy/pypy/changeset/aba6040f8abd/
changeset:   r40057:aba6040f8abd
user:        arigo
date:        2010-12-16 11:53:49
summary:     merge heads
affected #:  0 files (0 bytes)

--- a/py/_path/local.py	Thu Dec 16 11:53:08 2010 +0100
+++ b/py/_path/local.py	Thu Dec 16 11:53:49 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.