Patch #103343: Allow the important test_pkg to succeed under Jython.

diff --git a/Lib/test/output/test_pkg b/Lib/test/output/test_pkg
index 9015050b0932f5903897f27e366a32d902fa6ddb..8a5ab8de19083e3c0690afa3fb5760df3320b21c 100644 (file)
--- 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 80a11d8ce9e14e3fb1a33190ae659560c2af1c42..d915e10ce6ba6ed6ae38da997ce3e9e9f75e346d 100644 (file)
--- 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