[pypy-svn] r29288 - in pypy/release/0.9.x: lib-python lib-python/modified-2.4.1/test pypy/interpreter pypy/translator/js/modules/test

[arigo at codespeak.net]

Author: arigo
Date: Sat Jun 24 08:28:49 2006
New Revision: 29288

Added:
   pypy/release/0.9.x/lib-python/modified-2.4.1/test/test_scope.py
      - copied unchanged from r29281, pypy/dist/lib-python/modified-2.4.1/test/test_scope.py
Modified:
   pypy/release/0.9.x/lib-python/conftest.py
   pypy/release/0.9.x/lib-python/modified-2.4.1/test/test_class.py
   pypy/release/0.9.x/pypy/interpreter/argument.py
   pypy/release/0.9.x/pypy/translator/js/modules/test/test_xmlhttp.py
Log:
Backport r29275 to r29280 (arigo).


Modified: pypy/release/0.9.x/lib-python/conftest.py
==============================================================================
--- pypy/release/0.9.x/lib-python/conftest.py	(original)
+++ pypy/release/0.9.x/lib-python/conftest.py	Sat Jun 24 08:28:49 2006
@@ -889,6 +889,8 @@
                                    'run-script', 'regrverbose.py')
         pypy_options = []
         if regrtest.oldstyle: 
+            if option.use_compiled:
+                py.test.skip("old-style classes not available in pypy-c")
             pypy_options.append('--oldstyle') 
         if regrtest.uselibfile: 
             pypy_options.append('--uselibfile')

Modified: pypy/release/0.9.x/lib-python/modified-2.4.1/test/test_class.py
==============================================================================
--- pypy/release/0.9.x/lib-python/modified-2.4.1/test/test_class.py	(original)
+++ pypy/release/0.9.x/lib-python/modified-2.4.1/test/test_class.py	Sat Jun 24 08:28:49 2006
@@ -244,6 +244,9 @@
 if sys.platform[:4] == 'java':
     import java
     java.lang.System.gc()
+else:
+    import gc
+    gc.collect()
 
 # Interfering tests
 

Modified: pypy/release/0.9.x/pypy/interpreter/argument.py
==============================================================================
--- pypy/release/0.9.x/pypy/interpreter/argument.py	(original)
+++ pypy/release/0.9.x/pypy/interpreter/argument.py	Sat Jun 24 08:28:49 2006
@@ -602,7 +602,7 @@
                 nargs)
         else:
             defcount = self.num_defaults
-            if defcount == 0 and has_vararg:
+            if defcount == 0 and not has_vararg:
                 msg1 = "exactly"
             elif not self.missing_args:
                 msg1 = "at most"

Modified: pypy/release/0.9.x/pypy/translator/js/modules/test/test_xmlhttp.py
==============================================================================
--- pypy/release/0.9.x/pypy/translator/js/modules/test/test_xmlhttp.py	(original)
+++ pypy/release/0.9.x/pypy/translator/js/modules/test/test_xmlhttp.py	Sat Jun 24 08:28:49 2006
@@ -3,7 +3,7 @@
 """
 
 import py
-from pypy import conftest
+from pypy.translator.js import conftest
 
 if not conftest.option.browser or not conftest.option.tg:
     py.test.skip("Works only in browser and with turbogears")