Applying patch #100994 to allow JPython to use more of the standard
Python test suite. Specifically,
- import time instead of strop in test_b1
- test for ClassType of exceptions using isinstance instead of
equality in test_exceptions
- remove __builtins__ from dir() output in test_pkg
test_pkg output needs to be regenerated.
diff --git a/Lib/test/test_pkg.py b/Lib/test/test_pkg.py
index a99da35..a0988e0 100644
--- a/Lib/test/test_pkg.py
+++ b/Lib/test/test_pkg.py
@@ -42,6 +42,13 @@
if verbose: print "rmdir", x
os.rmdir(x)
+def fixdir(lst):
+ try:
+ lst.remove('__builtins__')
+ except ValueError:
+ pass
+ return lst
+
# Helper to run a test
def runtest(hier, code):
@@ -146,9 +153,9 @@
from t5 import *
print dir()
import t5
-print dir(t5)
-print dir(t5.foo)
-print dir(t5.string)
+print fixdir(dir(t5))
+print fixdir(dir(t5.foo))
+print fixdir(dir(t5.string))
"""),
("t6", [
@@ -160,9 +167,9 @@
],
"""
import t6
-print dir(t6)
+print fixdir(dir(t6))
from t6 import *
-print dir(t6)
+print fixdir(dir(t6))
print dir()
"""),