Skip to content

Commit 3bf7a8e

Browse files
committed
Update pycatfile.py
1 parent d6cc59d commit 3bf7a8e

1 file changed

Lines changed: 1 addition & 28 deletions

File tree

pycatfile.py

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -859,15 +859,6 @@ def check_version_number(myversion=__version__, proname=__program_alt_name__, ne
859859
compressionsupport.append("lz4")
860860
except ImportError:
861861
pass
862-
'''
863-
try:
864-
import lzo
865-
compressionsupport.append("lzo")
866-
compressionsupport.append("lzop")
867-
except ImportError:
868-
lzo = None
869-
pass
870-
'''
871862
try:
872863
try:
873864
import compression.zstd as zstd
@@ -931,13 +922,6 @@ def check_version_number(myversion=__version__, proname=__program_alt_name__, ne
931922
compressionlistalt.append('lzo')
932923
outextlist.append('lzo')
933924
outextlistwd.append('.lzo')
934-
'''
935-
if('lzop' in compressionsupport):
936-
compressionlist.append('lzop')
937-
compressionlistalt.append('lzop')
938-
outextlist.append('lzop')
939-
outextlistwd.append('.lzop')
940-
'''
941925
if('lzma' in compressionsupport):
942926
compressionlist.append('lzma')
943927
compressionlistalt.append('lzma')
@@ -9004,8 +8988,6 @@ def CheckCompressionSubType(infile, formatspecs=__file_format_multi_dict__, file
90048988
compresscheck = "zstd"
90058989
elif(fextname == ".lz4"):
90068990
compresscheck = "lz4"
9007-
elif(fextname == ".lzo" or fextname == ".lzop"):
9008-
compresscheck = "lzo"
90098991
elif(fextname == ".lzma"):
90108992
compresscheck = "lzma"
90118993
elif(fextname == ".xz"):
@@ -9297,8 +9279,6 @@ def UncompressString(infile, formatspecs=__file_format_multi_dict__, filestart=0
92979279
fileuz = decompressor.decompress(infile)
92989280
elif(compresscheck == "lz4" and compresscheck in compressionsupport):
92999281
fileuz = lz4.frame.decompress(infile)
9300-
elif((compresscheck == "lzo" or compresscheck == "lzop") and compresscheck in compressionsupport):
9301-
fileuz = lzo.decompress(infile)
93029282
elif((compresscheck == "lzma" or compresscheck == "xz") and compresscheck in compressionsupport):
93039283
fileuz = lzma.decompress(infile)
93049284
elif(compresscheck == "zlib" and compresscheck in compressionsupport):
@@ -9349,8 +9329,6 @@ def UncompressBytes(infile, formatspecs=__file_format_multi_dict__, filestart=0)
93499329
fileuz = decompressor.decompress(infile)
93509330
elif(compresscheck == "lz4" and compresscheck in compressionsupport):
93519331
fileuz = lz4.frame.decompress(infile)
9352-
elif((compresscheck == "lzo" or compresscheck == "lzop") and compresscheck in compressionsupport):
9353-
fileuz = lzo.decompress(infile)
93549332
elif((compresscheck == "lzma" or compresscheck == "xz") and compresscheck in compressionsupport):
93559333
fileuz = lzma.decompress(infile)
93569334
elif(compresscheck == "zlib" and compresscheck in compressionsupport):
@@ -9922,9 +9900,6 @@ def _lvl(x):
99229900
elif compression == "lz4" and "lz4" in compressionsupport:
99239901
bytesfp = MkTempFile()
99249902
bytesfp.write(lz4.frame.compress(fp.read(), compression_level=_lvl(compressionlevel)))
9925-
elif (compression in ("lzo", "lzop")) and "lzop" in compressionsupport:
9926-
bytesfp = MkTempFile()
9927-
bytesfp.write(lzo.compress(fp.read(), _lvl(compressionlevel)))
99289903
elif compression == "zstd" and "zstandard" in compressionsupport:
99299904
bytesfp = MkTempFile()
99309905
level = _lvl(compressionlevel)
@@ -10299,10 +10274,8 @@ def CatFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__file_form
1029910274
compresscheck = "bzip2"
1030010275
elif(fextname == ".zst"):
1030110276
compresscheck = "zstd"
10302-
elif(fextname == ".lz4" or fextname == ".clz4"):
10277+
elif(fextname == ".lz4"):
1030310278
compresscheck = "lz4"
10304-
elif(fextname == ".lzo" or fextname == ".lzop"):
10305-
compresscheck = "lzo"
1030610279
elif(fextname == ".lzma"):
1030710280
compresscheck = "lzma"
1030810281
elif(fextname == ".xz"):

0 commit comments

Comments
 (0)