Add files via upload

Author: HimariKitsune

pycatfile.py

@@ -622,7 +622,7 @@ def _get(section_dict, key, default=None):
 __version_date__ = str(__version_date_info__[0]) + "." + str(
     __version_date_info__[1]).zfill(2) + "." + str(__version_date_info__[2]).zfill(2)
 __revision__ = __version_info__[3]
-__revision_id__ = "$Id: b49a691e7b814a957c65b7e6859ae0670540456f $"
+__revision_id__ = "$Id: 340d37e5ca55078bf9f8c592ea941149b29caab1 $"
 if(__version_info__[4] is not None):
     __version_date_plusrc__ = __version_date__ + \
         "-" + str(__version_date_info__[4])
@@ -2792,6 +2792,21 @@ def from_bytes(cls, data, mode='rb', **kw):
         bio = io.BytesIO(bytes(data) if not isinstance(data, bytes) else data)
         return cls(fileobj=bio, mode=mode, **kw)
 
+    # compatibility aliases for unwrapping utilities
+    @property
+    def fileobj(self):
+        return self.file
+
+    @property
+    def myfileobj(self):
+        return self.file
+
+    # if some code expects ._fp to be “the stream itself”:
+    @property
+    def _fp(self):
+        # OR return self.file if callers intend the raw file
+        return self
+
 # ---------- Top-level helpers (optional) ----------
 def decompress_bytes(blob, **kw):
     """
@@ -3240,6 +3255,21 @@ def from_bytes(cls, data, mode='rb', **kw):
         bio = io.BytesIO(bytes(data) if not isinstance(data, bytes) else data)
         return cls(fileobj=bio, mode=mode, **kw)
 
+    # compatibility aliases for unwrapping utilities
+    @property
+    def fileobj(self):
+        return self.file
+
+    @property
+    def myfileobj(self):
+        return self.file
+
+    # if some code expects ._fp to be “the stream itself”:
+    @property
+    def _fp(self):
+        # OR return self.file if callers intend the raw file
+        return self
+
 
 # ---------- Top-level helpers ----------
 def gzip_decompress_bytes(blob, mode='rb', multi=True, **kw):
@@ -3762,6 +3792,21 @@ def from_bytes(cls, data, mode='rb', **kw):
         bio = io.BytesIO(bytes(data) if not isinstance(data, bytes) else data)
         return cls(fileobj=bio, mode=mode, **kw)
 
+    # compatibility aliases for unwrapping utilities
+    @property
+    def fileobj(self):
+        return self.file
+
+    @property
+    def myfileobj(self):
+        return self.file
+
+    # if some code expects ._fp to be “the stream itself”:
+    @property
+    def _fp(self):
+        # OR return self.file if callers intend the raw file
+        return self
+
 
 # ---------- Top-level helpers ----------
 def lzop_compress_bytes(payload, level=9, text=False, **kw):
@@ -5894,7 +5939,6 @@ def ReadInFileWithContentToArray(infile, fmttype="auto", filestart=0, seekstart=
                 infp.seek(oldinfppos, 0)
                 ArchiveList.append(ReadFileDataWithContentToArray(infp, currentinfilepos, seekstart, seekend, listonly, contentasfile, uncompress, skipchecksum, informatspecs, seektoend))
                 currentinfilepos = infp.tell()
-            infp.close()
             currentfilepos = fp.tell()
     return ArchiveList
 
@@ -8915,7 +8959,10 @@ def UncompressFileAlt(fp, formatspecs=__file_format_multi_dict__, filestart=0,
         return False
 
     # Always operate on the raw source for probe/wrap
-    src = getattr(fp, "_fp", fp)
+    if hasattr(fp, "_fp"):
+        src = getattr(fp, "_fp", fp)
+    else:
+        src = fp
 
     # Probe at filestart using RAW handle
     try: