diff options
author | Barry Warsaw <barry@python.org> | 2000-09-01 06:53:52 +0000 |
---|---|---|
committer | Barry Warsaw <barry@python.org> | 2000-09-01 06:53:52 +0000 |
commit | 9a6990b5433a43b240694e9bcb144ecaadbd4231 (patch) | |
tree | 7a81c6b1831851d0edf0efd62fe8d733ef7f70c2 /Lib/test/test_pkg.py | |
parent | 1295f0695341b7ed7db98bacf1620ee686828620 (diff) | |
download | cpython-9a6990b5433a43b240694e9bcb144ecaadbd4231.tar.gz |
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.py | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/Lib/test/test_pkg.py b/Lib/test/test_pkg.py index a99da353c7..a0988e0274 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() """), |