[Jython-checkins] jython: Fixed #2309 (see PR https://github.com/jythontools/jython/pull/66)

[stefan.richthofer]

https://hg.python.org/jython/rev/e725a0b2d939
changeset:   8065:e725a0b2d939
user:        James Mudd <james.mudd at gmail.com>
date:        Thu Mar 16 22:06:21 2017 +0100
summary:
  Fixed #2309 (see PR https://github.com/jythontools/jython/pull/66)

files:
  Lib/test/test_classpathimporter.py |  6 ++++--
  NEWS                               |  1 +
  2 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_classpathimporter.py b/Lib/test/test_classpathimporter.py
--- a/Lib/test/test_classpathimporter.py
+++ b/Lib/test/test_classpathimporter.py
@@ -26,13 +26,15 @@
     # with sys.path.append where not getting scanned if they start with a top
     # level package we already have, like the "org" in org.python.*
     def test_bug1239(self):
-        with test_support.DirsOnSysPath("Lib/test/bug1239.jar"):
+        jar = test_support.findfile("bug1239.jar")
+        with test_support.DirsOnSysPath(jar):
             import org.test403javapackage.test403
 
     # different from test_bug1239 in that only a Java package is imported, not
     # a Java class.  I'd also like to get rid of this checked in test jar.
     def test_bug1126(self):
-        with test_support.DirsOnSysPath("Lib/test/bug1126/bug1126.jar"):
+        jar = test_support.findfile("bug1126.jar", subdir="bug1126")
+        with test_support.DirsOnSysPath(jar):
             import org.subpackage
 
 
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@
 
 Jython 2.7.1rc1
   Bugs fixed
+    - [ 2309 ] test_classpathimporter fails on Windows.
     - [ 2318 ] test_zipimport_jy failure on Windows
     - [ 2571 ] Error handling in test_codecencodings_tw fails on Java 8
     - [ 2568 ] test_threading intermittent failure

-- 
Repository URL: https://hg.python.org/jython