Small update

Author: SakutoNekoUwU

pyneofile/pyneofile.py

@@ -1870,7 +1870,7 @@ def SevenZipFileCheck(infile):
         return False
 
 def CheckCompressionType(infile, formatspecs=__file_format_multi_dict__, filestart=0, closefp=True):
-    if(hasattr(infile, "read") or hasattr(infile, "write")):
+    if(hasattr(infile, "read")):
         fp = infile
     else:
         try:
@@ -2052,10 +2052,10 @@ def CheckCompressionSubType(infile, formatspecs=__file_format_multi_dict__, file
     elif(py7zr_support and compresscheck == "7zipfile" and py7zr.is_7zfile(infile)):
         return "7zipfile"
     precfp = None
-    if(hasattr(infile, "read") or hasattr(infile, "write") and compresscheck in compressionsupport):
+    if(hasattr(infile, "read") and compresscheck in compressionsupport):
         fp = UncompressFileAlt(infile, formatspecs, filestart)
         curloc = fp.tell()
-    elif(hasattr(infile, "read") or hasattr(infile, "write") and compresscheck not in compressionsupport):
+    elif(hasattr(infile, "read") and compresscheck not in compressionsupport):
         fp = infile
     else:
         try:
@@ -2136,7 +2136,7 @@ def CheckCompressionSubType(infile, formatspecs=__file_format_multi_dict__, file
     if(prefp == binascii.unhexlify("7061785f676c6f62616c")):
         filetype = "tarfile"
     fp.seek(curloc, 0)
-    if(hasattr(precfp, "read") or hasattr(precfp, "write")):
+    if(hasattr(precfp, "read")):
         precfp.close()
     if(closefp):
         fp.close()
@@ -2187,7 +2187,7 @@ def GetFileEncoding(infile, filestart=0, closefp=True):
     fp = None
 
     # --- Obtain a binary file object ---
-    if hasattr(infile, "read") or hasattr(infile, "write"):
+    if hasattr(infile, "read"):
         fp = infile
     else:
         try:
@@ -2271,7 +2271,7 @@ def GetBinaryFileType(infile, filestart=0, closefp=True):
         data = infile[filestart:filestart+560]
         fp = None
     else:
-        fp = infile if (hasattr(infile, "read") or hasattr(infile, "write")) else None
+        fp = infile if (hasattr(infile, "read")) else None
         if fp is None:
             try:
                 fp = open(infile, "rb")
@@ -5518,7 +5518,7 @@ def ReadFileDataWithContentToList(fp, filestart=0, seekstart=0, seekend=0, listo
 
 
 def ReadInFileWithContentToArray(infile, fmttype="auto", filestart=0, seekstart=0, seekend=0, listonly=False, contentasfile=True, uncompress=True, skipchecksum=False, formatspecs=__file_format_multi_dict__, saltkey=None, seektoend=False):
-    if(hasattr(infile, "read") or hasattr(infile, "write")):
+    if(hasattr(infile, "read")):
         fp = infile
         try:
             fp.seek(0, 2)
@@ -5629,7 +5629,7 @@ def ReadInMultipleFilesWithContentToArray(infile, fmttype="auto", filestart=0, s
 
 
 def ReadInFileWithContentToList(infile, fmttype="auto", filestart=0, seekstart=0, seekend=0, listonly=False, contentasfile=True, uncompress=True, skipchecksum=False, formatspecs=__file_format_multi_dict__, saltkey=None, seektoend=False):
-    if(hasattr(infile, "read") or hasattr(infile, "write")):
+    if(hasattr(infile, "read")):
         fp = infile
         try:
             fp.seek(0, 2)
@@ -5894,7 +5894,7 @@ def MakeEmptyNeoFilePointer(fp, fmttype=__file_format_default__, checksumtype=["
 
 def MakeEmptyFile(outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, checksumtype=["md5", "md5"], formatspecs=__file_format_multi_dict__, saltkey=None, returnfp=False):
     if(IsNestedDict(formatspecs) and fmttype=="auto" and 
-        (outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write"))):
+        (outfile != "-" and outfile is not None and not hasattr(outfile, "read"))):
         get_in_ext = os.path.splitext(outfile)
         tmpfmt = GetKeyByFormatExtension(get_in_ext[1], formatspecs=__file_format_multi_dict__)
         if(tmpfmt is None and get_in_ext[1]!=""):
@@ -5911,7 +5911,7 @@ def MakeEmptyFile(outfile, fmttype="auto", compression="auto", compresswholefile
     elif(IsNestedDict(formatspecs) and fmttype not in formatspecs):
         fmttype = __file_format_default__
         formatspecs = formatspecs[fmttype]
-    if(outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
+    if(outfile != "-" and outfile is not None and not hasattr(outfile, "read")):
         if(os.path.exists(outfile)):
             try:
                 os.unlink(outfile)
@@ -5920,7 +5920,7 @@ def MakeEmptyFile(outfile, fmttype="auto", compression="auto", compresswholefile
     if(outfile == "-" or outfile is None):
         verbose = False
         fp = MkTempFile()
-    elif(hasattr(outfile, "read") or hasattr(outfile, "write")):
+    elif(hasattr(outfile, "read")):
         fp = outfile
         return MakeEmptyFilePointer(fp, fmttype, checksumtype, formatspecs, saltkey)
     elif(re.findall(__upload_proto_support__, outfile) and pywwwget):
@@ -5935,7 +5935,7 @@ def MakeEmptyFile(outfile, fmttype="auto", compression="auto", compresswholefile
         except PermissionError:
             return False
     AppendFileHeader(fp, fmttype, 0, "UTF-8", [], {}, checksumtype, formatspecs, saltkey)
-    if(outfile == "-" or outfile is None or hasattr(outfile, "read") or hasattr(outfile, "write")):
+    if(outfile == "-" or outfile is None or hasattr(outfile, "read")):
         fp = CompressOpenFileAlt(
             fp, compression, compressionlevel, compressionuselist, formatspecs)
         try:
@@ -6094,7 +6094,7 @@ def AppendFilesWithContentFromInFile(infile, fp, fmttype="auto", listtype="dir",
 
 def AppendFilesWithContentFromInFileToOutFile(infiles, outfile, listtype="dir", fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, extradata=[], jsondata={}, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_multi_dict__, saltkey=None, verbose=False, returnfp=False):
     if(IsNestedDict(formatspecs) and fmttype=="auto" and 
-        (outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write"))):
+        (outfile != "-" and outfile is not None and not hasattr(outfile, "read"))):
         get_in_ext = os.path.splitext(outfile)
         tmpfmt = GetKeyByFormatExtension(get_in_ext[1], formatspecs=__file_format_multi_dict__)
         if(tmpfmt is None and get_in_ext[1]!=""):
@@ -6111,7 +6111,7 @@ def AppendFilesWithContentFromInFileToOutFile(infiles, outfile, listtype="dir",
     elif(IsNestedDict(formatspecs) and fmttype not in formatspecs):
         fmttype = __file_format_default__
         ckformatspecs = formatspecs[fmttype]
-    if(outfile != "-" and outfile is not None and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
+    if(outfile != "-" and outfile is not None and not hasattr(outfile, "read")):
         outfile = RemoveWindowsPath(outfile)
         if(os.path.exists(outfile)):
             try:
@@ -6121,7 +6121,7 @@ def AppendFilesWithContentFromInFileToOutFile(infiles, outfile, listtype="dir",
     if(outfile == "-" or outfile is None):
         verbose = False
         fp = MkTempFile()
-    elif(hasattr(outfile, "read") or hasattr(outfile, "write")):
+    elif(hasattr(outfile, "read")):
         fp = outfile
     elif(re.findall(__upload_proto_support__, outfile) and pywwwget):
         fp = MkTempFile()
@@ -6135,7 +6135,7 @@ def AppendFilesWithContentFromInFileToOutFile(infiles, outfile, listtype="dir",
         except PermissionError:
             return False
     AppendFilesWithContentFromInFile(infiles, fp, fmttype, listtype, extradata, jsondata, compression, compresswholefile, compressionlevel, compressionuselist, checksumtype, formatspecs, saltkey, verbose)
-    if(outfile == "-" or outfile is None or hasattr(outfile, "read") or hasattr(outfile, "write")):
+    if(outfile == "-" or outfile is None or hasattr(outfile, "read")):
         fp = CompressOpenFileAlt(
             fp, compression, compressionlevel, compressionuselist, formatspecs)
         try:
@@ -6860,7 +6860,7 @@ def AppendFilesWithContentFromBSDTarFileToList(infile, fmttype="auto", extradata
             formatspecs = formatspecs[fmttype]
         elif(IsNestedDict(formatspecs) and fmttype not in formatspecs):
             fmttype = __file_format_default__
-        formatspecs = formatspecs[fmttype]
+            formatspecs = formatspecs[fmttype]
         curinode = 0
         curfid = 0
         inodelist = []