Skip to content

Commit ecaaf01

Browse files
committed
Update pyneofile.py
1 parent 17f7c02 commit ecaaf01

File tree

1 file changed

+1
-28
lines changed

1 file changed

+1
-28
lines changed

pyneofile.py

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -853,15 +853,6 @@ def check_version_number(myversion=__version__, proname=__program_alt_name__, ne
853853
compressionsupport.append("lz4")
854854
except ImportError:
855855
pass
856-
'''
857-
try:
858-
import lzo
859-
compressionsupport.append("lzo")
860-
compressionsupport.append("lzop")
861-
except ImportError:
862-
lzo = None
863-
pass
864-
'''
865856
try:
866857
try:
867858
import compression.zstd as zstd
@@ -925,13 +916,6 @@ def check_version_number(myversion=__version__, proname=__program_alt_name__, ne
925916
compressionlistalt.append('lzo')
926917
outextlist.append('lzo')
927918
outextlistwd.append('.lzo')
928-
'''
929-
if('lzop' in compressionsupport):
930-
compressionlist.append('lzop')
931-
compressionlistalt.append('lzop')
932-
outextlist.append('lzop')
933-
outextlistwd.append('.lzop')
934-
'''
935919
if('lzma' in compressionsupport):
936920
compressionlist.append('lzma')
937921
compressionlistalt.append('lzma')
@@ -8998,8 +8982,6 @@ def CheckCompressionSubType(infile, formatspecs=__file_format_multi_dict__, file
89988982
compresscheck = "zstd"
89998983
elif(fextname == ".lz4"):
90008984
compresscheck = "lz4"
9001-
elif(fextname == ".lzo" or fextname == ".lzop"):
9002-
compresscheck = "lzo"
90038985
elif(fextname == ".lzma"):
90048986
compresscheck = "lzma"
90058987
elif(fextname == ".xz"):
@@ -9291,8 +9273,6 @@ def UncompressString(infile, formatspecs=__file_format_multi_dict__, filestart=0
92919273
fileuz = decompressor.decompress(infile)
92929274
elif(compresscheck == "lz4" and compresscheck in compressionsupport):
92939275
fileuz = lz4.frame.decompress(infile)
9294-
elif((compresscheck == "lzo" or compresscheck == "lzop") and compresscheck in compressionsupport):
9295-
fileuz = lzo.decompress(infile)
92969276
elif((compresscheck == "lzma" or compresscheck == "xz") and compresscheck in compressionsupport):
92979277
fileuz = lzma.decompress(infile)
92989278
elif(compresscheck == "zlib" and compresscheck in compressionsupport):
@@ -9343,8 +9323,6 @@ def UncompressBytes(infile, formatspecs=__file_format_multi_dict__, filestart=0)
93439323
fileuz = decompressor.decompress(infile)
93449324
elif(compresscheck == "lz4" and compresscheck in compressionsupport):
93459325
fileuz = lz4.frame.decompress(infile)
9346-
elif((compresscheck == "lzo" or compresscheck == "lzop") and compresscheck in compressionsupport):
9347-
fileuz = lzo.decompress(infile)
93489326
elif((compresscheck == "lzma" or compresscheck == "xz") and compresscheck in compressionsupport):
93499327
fileuz = lzma.decompress(infile)
93509328
elif(compresscheck == "zlib" and compresscheck in compressionsupport):
@@ -9916,9 +9894,6 @@ def _lvl(x):
99169894
elif compression == "lz4" and "lz4" in compressionsupport:
99179895
bytesfp = MkTempFile()
99189896
bytesfp.write(lz4.frame.compress(fp.read(), compression_level=_lvl(compressionlevel)))
9919-
elif (compression in ("lzo", "lzop")) and "lzop" in compressionsupport:
9920-
bytesfp = MkTempFile()
9921-
bytesfp.write(lzo.compress(fp.read(), _lvl(compressionlevel)))
99229897
elif compression == "zstd" and "zstandard" in compressionsupport:
99239898
bytesfp = MkTempFile()
99249899
level = _lvl(compressionlevel)
@@ -10293,10 +10268,8 @@ def NeoFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__file_form
1029310268
compresscheck = "bzip2"
1029410269
elif(fextname == ".zst"):
1029510270
compresscheck = "zstd"
10296-
elif(fextname == ".lz4" or fextname == ".clz4"):
10271+
elif(fextname == ".lz4"):
1029710272
compresscheck = "lz4"
10298-
elif(fextname == ".lzo" or fextname == ".lzop"):
10299-
compresscheck = "lzo"
1030010273
elif(fextname == ".lzma"):
1030110274
compresscheck = "lzma"
1030210275
elif(fextname == ".xz"):

0 commit comments

Comments
 (0)