MonetDB: Oct2020 - Delay imports until needed; add conditional.

[Sjoerd Mullender]

Changeset: 5c09a27e86f6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5c09a27e86f6
Modified Files:
        common/stream/Tests/All
        common/stream/Tests/testdata.py
Branch: Oct2020
Log Message:

Delay imports until needed; add conditional.


diffs (61 lines):

diff --git a/common/stream/Tests/All b/common/stream/Tests/All
--- a/common/stream/Tests/All
+++ b/common/stream/Tests/All
@@ -1,13 +1,13 @@
 read_uncompressed
 HAVE_LIBBZ2?read_bz2
 HAVE_LIBZ?read_gz
-HAVE_LIBLZ4?read_lz4
+HAVE_LIBLZ4&HAVE_PYTHON_LZ4?read_lz4
 HAVE_LIBLZMA?read_xz
 
 write_uncompressed
 HAVE_LIBBZ2?write_bz2
 HAVE_LIBZ?write_gz
-HAVE_LIBLZ4?write_lz4
+HAVE_LIBLZ4&HAVE_PYTHON_LZ4?write_lz4
 HAVE_LIBLZMA?write_xz
 
 urlstream
diff --git a/common/stream/Tests/testdata.py b/common/stream/Tests/testdata.py
--- a/common/stream/Tests/testdata.py
+++ b/common/stream/Tests/testdata.py
@@ -2,10 +2,7 @@
 
 # Generating test files and verifying them after transmission.
 
-import bz2
 import gzip
-import lz4.frame
-import lzma
 
 import os
 import sys
@@ -208,10 +205,13 @@ class TestFile:
         elif self.compression == 'gz':
             f = gzip.GzipFile(filename, 'wb', fileobj=fileobj, 
mtime=131875200, compresslevel=1)
         elif self.compression == 'bz2':
+            import bz2
             f = bz2.BZ2File(fileobj, 'wb', compresslevel=1)
         elif self.compression == 'xz':
+            import lzma
             f = lzma.LZMAFile(fileobj, 'wb', preset=1)
         elif self.compression == 'lz4': # ok
+            import lz4.frame
             f = lz4.frame.LZ4FrameFile(fileobj, 'wb', compression_level=1)
         else:
             raise Exception("Unknown compression scheme: " + self.compression)
@@ -225,10 +225,13 @@ class TestFile:
         elif self.compression == 'gz':
             f = gzip.GzipFile(filename, 'rb', mtime=131875200)
         elif self.compression == 'bz2':
+            import bz2
             f = bz2.BZ2File(filename, 'rb')
         elif self.compression == 'xz':
+            import lzma
             f = lzma.LZMAFile(filename, 'rb')
         elif self.compression == 'lz4':
+            import lz4.frame
             f = lz4.frame.LZ4FrameFile(filename, 'rb')
         else:
             raise Exception("Unknown compression scheme: " + self.compression)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list