[GR-15813] When tregex.jar file is not classpath, is not possible to import a module.

PullRequest: graalpython/518

Author: ppisl

graalpython/com.oracle.graal.python.test/src/tests/testGR15813.zip

@@ -25,11 +25,13 @@ def get_file():
 
 ZIP_FILE_NAME = 'testzipfile.zip'
 EGG_FILE_NAME = 'testeggfile.egg'
+GR15813_FILE_NAME = 'testGR15813.zip'
 DIR_PATH = os.path.dirname(os.path.realpath(__file__))
 ZIP_PATH = os.path.join(DIR_PATH, ZIP_FILE_NAME)
 ZIP_ABS_PATH = os.path.abspath(ZIP_PATH);
 EGG_PATH = os.path.join(DIR_PATH, EGG_FILE_NAME)
 EGG_ABS_PATH = os.path.abspath(EGG_PATH);
+GR15813_PATH = os.path.join(DIR_PATH, GR15813_FILE_NAME)
 
 class ZipImportBaseTestCase(unittest.TestCase):
 
@@ -202,3 +204,15 @@ def test_egg_get_readme(self):
         data = self.z.get_data("read.me")
         self.assertTrue(type(data) is bytes)
         self.assertEqual(bytes(b'Pokus\n'), data)
+
+class GR15813ImportTests(ZipImportBaseTestCase):
+
+    # don't edit the zip file !!!
+    def setUp(self):
+        ZipImportBaseTestCase.setUp(self)
+        self.z = zipimport.zipimporter(GR15813_PATH)
+
+    def test_zipimporter_gr_18813(self):
+        self.assertTrue(self.z.prefix == "")
+        self.assertTrue(type(self.z._files) is dict)
+        self.assertTrue(6, len(self.z._files))

graalpython/com.oracle.graal.python.test/src/tests/test_zipimport.py

@@ -150,21 +150,23 @@ public int read() throws IOException {
                     if (ch == LOC_SIG[1]) {
                         state = AFTER_PK;
                     } else {
-                        state = BEFORE_P;
+                        state = ch != LOC_SIG[0] ? BEFORE_P : AFTER_P;
                     }
                     break;
                 case AFTER_PK:
                     if (ch == LOC_SIG[2]) {
                         state = AFTER_PK3;
                     } else {
-                        state = BEFORE_P;
+                        state = ch != LOC_SIG[0] ? BEFORE_P : AFTER_P;
                     }
                     break;
                 case AFTER_PK3:
                     if (ch == LOC_SIG[3]) {
                         positions.add(pos - 4);  // store the LOC position
+                        state = BEFORE_P;
+                    } else {
+                        state = ch != LOC_SIG[0] ? BEFORE_P : AFTER_P;
                     }
-                    state = BEFORE_P;
             }
             return ch;
         }
@@ -238,15 +240,19 @@ private void initZipImporter(PZipImporter self, String path) {
                         long lastZipEntryCSize = 0;
                         long lastZipEntryPos = 0;
                         int lastZipLocFileHeaderSize = 0;
-                        long zipEntryPos;
+                        long zipEntryPos = 0;
 
                         byte[] extraField;
                         while ((entry = zis.getNextEntry()) != null) {
-                            zipEntryPos = locis.positions.remove(0);
-                            // handles situation when the local file signature is
-                            // in the content of a file
-                            while (lastZipEntryPos + lastZipEntryCSize + lastZipLocFileHeaderSize > zipEntryPos) {
+                            if (!locis.positions.isEmpty()) {
                                 zipEntryPos = locis.positions.remove(0);
+                                // handles situation when the local file signature is
+                                // in the content of a file
+                                while (lastZipEntryPos + lastZipEntryCSize + lastZipLocFileHeaderSize > zipEntryPos) {
+                                    zipEntryPos = locis.positions.remove(0);
+                                }
+                            } else {
+                                throw raise(PythonErrorType.ZipImportError, "cannot handle Zip file: '%s'", archive);
                             }
 
                             PTuple tuple = factory().createTuple(new Object[]{