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.

1 files changed, 5 insertions, 5 deletions

diff --git a/Lib/test/output/test_pkg b/Lib/test/output/test_pkg
index 4e67f8c..9015050 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