Add files via upload

Author: Joshua Thomas Przyborowski

pycatfile.py

@@ -3529,7 +3529,7 @@ def UncompressArchiveFile(fp, formatspecs=__file_format_dict__):
     elif(compresscheck == "bzip2" and compresscheck in compressionsupport):
         catfp = bz2.BZ2File(fp)
     elif(compresscheck == "zstd" and compresscheck in compressionsupport):
-        if 'zstandard' in sys.modules:
+        if 'zstandard' in sys.modules and 'pyzstd' not in sys.modules:
             catfp = ZstdFile(fileobj=fp, mode="rb")
         elif 'pyzstd' in sys.modules:
             catfp = pyzstd.zstdfile.ZstdFile(fileobj=fp, mode="rb")
@@ -3576,7 +3576,7 @@ def UncompressFile(infile, formatspecs=__file_format_dict__, mode="rb"):
         elif(compresscheck == "bzip2" and compresscheck in compressionsupport):
             filefp = bz2.open(infile, mode)
         elif(compresscheck == "zstd" and compresscheck in compressionsupport):
-            if 'zstandard' in sys.modules:
+            if 'zstandard' in sys.modules and 'pyzstd' not in sys.modules:
                 filefp = ZstdFile(infile, mode=mode)
             elif 'pyzstd' in sys.modules:
                 filefp = pyzstd.zstdfile.ZstdFile(infile, mode=mode)
@@ -3761,7 +3761,7 @@ def CheckCompressionSubType(infile, formatspecs=__file_format_dict__, closefp=Tr
             elif(compresscheck == "lz4" and compresscheck in compressionsupport):
                 catfp = lz4.frame.open(infile, "rb")
             elif(compresscheck == "zstd" and compresscheck in compressionsupport):
-                if 'zstandard' in sys.modules:
+                if 'zstandard' in sys.modules and 'pyzstd' not in sys.modules:
                     catfp = ZstdFile(infile, mode="rb")
                 elif 'pyzstd' in sys.modules:
                     catfp = pyzstd.zstdfile.ZstdFile(infile, mode="rb")
@@ -3907,7 +3907,7 @@ def CompressOpenFile(outfile, compressionenable=True, compressionlevel=None):
         elif(fextname == ".bz2" and "bzip2" in compressionsupport):
             outfp = bz2.open(outfile, mode, compressionlevel)
         elif(fextname == ".zst" and "zstandard" in compressionsupport):
-            if 'zstandard' in sys.modules:
+            if 'zstandard' in sys.modules and 'pyzstd' not in sys.modules:
                 outfp = ZstdFile(outfile, mode=mode, level=compressionlevel)
             elif 'pyzstd' in sys.modules:
                 outfp = pyzstd.zstdfile.ZstdFile(outfile, mode=mode, level=compressionlevel)