diff options
| author | Tim Peters <tim.peters@gmail.com> | 2001-01-21 19:51:53 (GMT) |
|---|---|---|
| committer | Tim Peters <tim.peters@gmail.com> | 2001-01-21 19:51:53 (GMT) |
| commit | d304f44906b818c7e336fcbb99241516c9170d29 (patch) | |
| tree | 60813d927e83d3ea6b90c54e7aea876c5d75f124 | |
| parent | db786876b6c5ab24c1cd7427fd077545dbb72fee (diff) | |
| download | cpython-d304f44906b818c7e336fcbb99241516c9170d29.zip cpython-d304f44906b818c7e336fcbb99241516c9170d29.tar.gz cpython-d304f44906b818c7e336fcbb99241516c9170d29.tar.bz2 | |
Patch #103343: Allow the important test_pkg to succeed under Jython.
| -rw-r--r-- | Lib/test/output/test_pkg | 6 | ||||
| -rw-r--r-- | Lib/test/test_pkg.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Lib/test/output/test_pkg b/Lib/test/output/test_pkg index 9015050..8a5ab8d 100644 --- a/Lib/test/output/test_pkg +++ b/Lib/test/output/test_pkg @@ -38,8 +38,8 @@ t6.eggs loading ['eggs', 'ham', 'spam', 't6'] running test t7 t7 loading -['__builtins__', '__doc__', '__file__', '__name__', '__path__'] -['__builtins__', '__doc__', '__file__', '__name__', '__path__'] +['__doc__', '__file__', '__name__', '__path__'] +['__doc__', '__file__', '__name__', '__path__'] t7.sub.subsub loading -['__builtins__', '__doc__', '__file__', '__name__', '__path__', 'spam'] +['__doc__', '__file__', '__name__', '__path__', 'spam'] t7.sub.subsub.spam = 1 diff --git a/Lib/test/test_pkg.py b/Lib/test/test_pkg.py index 80a11d8..d915e10 100644 --- a/Lib/test/test_pkg.py +++ b/Lib/test/test_pkg.py @@ -187,13 +187,13 @@ print dir() """ t7, sub, subsub = None, None, None import t7 as tas -print dir(tas) +print fixdir(dir(tas)) verify(not t7) from t7 import sub as subpar -print dir(subpar) +print fixdir(dir(subpar)) verify(not t7 and not sub) from t7.sub import subsub as subsubsub -print dir(subsubsub) +print fixdir(dir(subsubsub)) verify(not t7 and not sub and not subsub) from t7.sub.subsub import spam as ham print "t7.sub.subsub.spam =", ham |