From 3a9d0611fb5ec9cff7d24c885349637838b20c30 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Fri, 1 Sep 2000 06:53:52 +0000
Subject: [PATCH] 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.
---
 Lib/test/output/test_pkg    | 10 +++++-----
 Lib/test/test_b1.py         |  2 +-
 Lib/test/test_exceptions.py |  2 +-
 Lib/test/test_pkg.py        | 17 ++++++++++++-----
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Lib/test/output/test_pkg b/Lib/test/output/test_pkg
index 4e67f8cf81d..9015050b093 100644
--- a/Lib/test/output/test_pkg
+++ b/Lib/test/output/test_pkg
@@ -26,15 +26,15 @@ t5.foo loading
 t5.string loading
 1
 ['foo', 'string', 't5']
-['__builtins__', '__doc__', '__file__', '__name__', '__path__', 'foo', 'string', 't5']
-['__builtins__', '__doc__', '__file__', '__name__', 'string']
-['__builtins__', '__doc__', '__file__', '__name__', 'spam']
+['__doc__', '__file__', '__name__', '__path__', 'foo', 'string', 't5']
+['__doc__', '__file__', '__name__', 'string']
+['__doc__', '__file__', '__name__', 'spam']
 running test t6
-['__all__', '__builtins__', '__doc__', '__file__', '__name__', '__path__']
+['__all__', '__doc__', '__file__', '__name__', '__path__']
 t6.spam loading
 t6.ham loading
 t6.eggs loading
-['__all__', '__builtins__', '__doc__', '__file__', '__name__', '__path__', 'eggs', 'ham', 'spam']
+['__all__', '__doc__', '__file__', '__name__', '__path__', 'eggs', 'ham', 'spam']
 ['eggs', 'ham', 'spam', 't6']
 running test t7
 t7 loading
diff --git a/Lib/test/test_b1.py b/Lib/test/test_b1.py
index d9bc04d52a0..f8dfe472537 100644
--- a/Lib/test/test_b1.py
+++ b/Lib/test/test_b1.py
@@ -4,7 +4,7 @@ from test_support import *
 
 print '__import__'
 __import__('sys')
-__import__('strop')
+__import__('time')
 __import__('string')
 try: __import__('spamspam')
 except ImportError: pass
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 06861dfb306..7ee203c4475 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -19,7 +19,7 @@ def test_raise_catch(exc):
 
 def r(thing):
     test_raise_catch(thing)
-    if type(thing) == ClassType:
+    if isinstance(thing, ClassType):
         print thing.__name__
     else:
         print thing
diff --git a/Lib/test/test_pkg.py b/Lib/test/test_pkg.py
index a99da353c78..a0988e02746 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()
 """),