From: Yann Collet <yann.collet.73@gmail.com>
Date: Mon, 23 May 2016 13:43:17 +0000 (+0200)
Subject: more portable DEVNULL definition
X-Git-Tag: v0.7.0^2~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da4fe741b8fcb8fc9c33e0b4047e949966a6d800;p=thirdparty%2Fzstd.git

more portable DEVNULL definition
---

diff --git a/versionsTest/test-zstd-versions.py b/versionsTest/test-zstd-versions.py
index f3359ba6e..b18c3d3c2 100644
--- a/versionsTest/test-zstd-versions.py
+++ b/versionsTest/test-zstd-versions.py
@@ -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