Skip to content

Commit 8e81676

Browse files
committed
Modifying test to pass on old version of Python.
Removing unused imports.
1 parent 70ba7e8 commit 8e81676

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,9 @@ def __fspath__(self):
100100

101101
zipimport._zip_directory_cache.clear()
102102
mp = MyPath(ZIP_PATH)
103-
z = zipimport.zipimporter(mp)
104-
self.assertTrue(zipimport._zip_directory_cache[os.path.abspath(ZIP_PATH)] is not None)
103+
if (sys.version_info.major >= 3 and sys.version_info.minor >= 6):
104+
z = zipimport.zipimporter(mp)
105+
self.assertTrue(zipimport._zip_directory_cache[os.path.abspath(ZIP_PATH)] is not None)
105106

106107
def test_zipimporter_find_module(self):
107108
self.assertTrue(self.z is self.z.find_module("MyTestModule"))

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ZipImportModuleBuiltins.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import com.oracle.graal.python.builtins.objects.module.PythonModule;
5151
import com.oracle.graal.python.builtins.objects.type.PythonClass;
5252
import com.oracle.graal.python.builtins.objects.zipimporter.PZipImporter;
53-
import com.oracle.graal.python.builtins.objects.zipimporter.ZipImporterBuiltins;
5453
import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
5554
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
5655
import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/zipimporter/ZipImporterBuiltins.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
import com.oracle.graal.python.nodes.object.GetLazyClassNode;
5858
import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
5959
import com.oracle.graal.python.runtime.exception.PythonErrorType;
60-
import com.oracle.graal.python.runtime.object.PythonObjectFactory;
6160
import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
6261
import com.oracle.truffle.api.CompilerDirectives;
6362
import com.oracle.truffle.api.dsl.Cached;

0 commit comments

Comments
 (0)