summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_pkg.py
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2000-09-01 06:53:52 (GMT)
committerBarry Warsaw <barry@python.org>2000-09-01 06:53:52 (GMT)
commit3a9d0611fb5ec9cff7d24c885349637838b20c30 (patch)
treec4c3df922dc7f68126f9fb7178f5c16e9e54c79f /Lib/test/test_pkg.py
parent736aa32a39d1c7afb5f3298fd0e13c51754546c7 (diff)
downloadcpython-3a9d0611fb5ec9cff7d24c885349637838b20c30.zip
cpython-3a9d0611fb5ec9cff7d24c885349637838b20c30.tar.gz
cpython-3a9d0611fb5ec9cff7d24c885349637838b20c30.tar.bz2
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.
Diffstat (limited to 'Lib/test/test_pkg.py')
-rw-r--r--Lib/test/test_pkg.py17
1 files changed, 12 insertions, 5 deletions
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 @@ def rmdir(x):
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 @@ import t5
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 @@ print dir(t5.string)
],
"""
import t6
-print dir(t6)
+print fixdir(dir(t6))
from t6 import *
-print dir(t6)
+print fixdir(dir(t6))
print dir()
"""),