]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
more portable DEVNULL definition
authorYann Collet <yann.collet.73@gmail.com>
Mon, 23 May 2016 13:43:17 +0000 (15:43 +0200)
committerYann Collet <yann.collet.73@gmail.com>
Mon, 23 May 2016 13:43:17 +0000 (15:43 +0200)
versionsTest/test-zstd-versions.py

index f3359ba6e9e439c1ce9027bf3d0710d21c20d450..b18c3d3c2123fb242d503af42ec0896c29458f66 100644 (file)
@@ -41,7 +41,10 @@ def get_git_tags():
     return tags
 
 def compress_sample(tag, sample):
-    from subprocess import DEVNULL
+    try:
+        from subprocess import DEVNULL # py3k
+    except ImportError:
+        DEVNULL = open(os.devnull, 'wb')
     if subprocess.call(['./zstd.' + tag, '-f'  ,  sample], stderr=DEVNULL)==0:
         os.rename(sample + '.zst', sample + '_01_64_' + tag + '.zst')
     if subprocess.call(['./zstd.' + tag, '-5f' ,  sample], stderr=DEVNULL)==0:
@@ -76,7 +79,10 @@ def remove_duplicates():
 def decompress_zst(tag):
     dec_error = 0
     list_zst = sorted(glob.glob('*.zst'))
-    from subprocess import DEVNULL
+    try:
+        from subprocess import DEVNULL # py3k
+    except ImportError:
+        DEVNULL = open(os.devnull, 'wb')
     for file_zst in list_zst:
         print(file_zst, end=" ")
         print(tag, end=" ")
@@ -91,6 +97,7 @@ def decompress_zst(tag):
             print('command does not work')
     return dec_error
 
+
 if __name__ == '__main__':
     error_code = 0
     base_dir = os.getcwd() + '/..'           # /path/to/zstd