Minor 2.3 changes and fixes

diff --git a/runtests.py b/runtests.py
index 4508411ba3d37505f3f925e807d4ec18f9955058..12a00ad1814b37d6e28cb328d078d01f7c9c8530 100644 (file)
--- a/runtests.py
+++ b/runtests.py
@@ -343,7 +343,7 @@ def collect_doctests(path, module_prefix, suite, selectors):
                         module = getattr(module, x)
                     if hasattr(module, "__doc__") or hasattr(module, "__test__"):
                         try:
-                            suite.addTests(doctest.DocTestSuite(module))
+                            suite.addTest(doctest.DocTestSuite(module))
                         except ValueError: # no tests
                             pass
 

diff --git a/tests/errors/nogil.pyx b/tests/errors/nogil.pyx
index 17e2e4343c905ed642930231af54c4278a6a994d..9dfbc8cd889437f61fbd34cdbf54d9075142b9b7 100644 (file)
--- a/tests/errors/nogil.pyx
+++ b/tests/errors/nogil.pyx
@@ -86,7 +86,6 @@ _ERRORS = u"""
 15: 5: Calling gil-requiring function without gil
 24: 9: Calling gil-requiring function without gil
 26:12: Assignment of Python object not allowed without gil
-27: 8: Constructing Python long int not allowed without gil
 28: 8: Constructing complex number not allowed without gil
 29:12: Accessing Python global or builtin not allowed without gil
 30: 8: Backquote expression not allowed without gil

diff --git a/tests/run/powop.pyx b/tests/run/powop.pyx
index d3765a9526734e4596b7b609954bbef74cdeb8f2..3d8c9b0fe566627cbe03d345fc42e2f0c0d407b4 100644 (file)
--- a/tests/run/powop.pyx
+++ b/tests/run/powop.pyx
@@ -34,9 +34,9 @@ def h(i):
     return 5 ** i
 
 def constant_py():
-    result = 2L ** 10
+    result = (<object>2) ** 10
     return result
 
 def constant_long():
-    result = 2L ** 36
+    result = (<object>2L) ** 36
     return result