Add files via upload

Author: ReikaNekoUwU

pycatfile_py3.py

@@ -138,7 +138,6 @@ def randbits(k):
 unicode = str
 long = int
 file = IOBase
-PY2 = False
 
 text_type = str
 bytes_type = bytes
@@ -705,7 +704,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$"
+__revision_id__ = "$Id: bb61609918b298a313c64211b6e31f22719f07bc $"
 if(__version_info__[4] is not None):
     __version_date_plusrc__ = __version_date__ + \
         "-" + str(__version_date_info__[4])
@@ -1376,36 +1375,17 @@ def _normalize_initial_data(data, isbytes, encoding, errors=None):
         b = _as_bytes_like(data)
         if b is not None:
             return b
-        if PY2:
-            # Py2: 'unicode' -> encode; 'str' is already bytes
-            if isinstance(data, unicode_type):
-                return data.encode(encoding, errors)
-            if isinstance(data, str):
-                return data
-        else:
-            # Py3: text -> encode
-            if isinstance(data, str):
-                return data.encode(encoding, errors)
+        if isinstance(data, str):
+            return data.encode(encoding, errors)
         raise TypeError("data must be bytes-like or text for isbytes=True (got %r)" % (type(data),))
     else:
         # text mode
-        if PY2:
-            if isinstance(data, unicode_type):
-                return data
-            b = _as_bytes_like(data)
-            if b is not None:
-                return b.decode(encoding, errors)
-            if isinstance(data, str):
-                # Py2 str -> decode
-                return data.decode(encoding, errors)
-            raise TypeError("data must be unicode or bytes-like for text mode (got %r)" % (type(data),))
-        else:
-            if isinstance(data, str):
-                return data
-            b = _as_bytes_like(data)
-            if b is not None:
-                return b.decode(encoding, errors)
-            raise TypeError("data must be str or bytes-like for text mode (got %r)" % (type(data),))
+        if isinstance(data, str):
+            return data
+        b = _as_bytes_like(data)
+        if b is not None:
+            return b.decode(encoding, errors)
+        raise TypeError("data must be str or bytes-like for text mode (got %r)" % (type(data),))
 
 
 def MkTempFile(data=None,
@@ -1887,17 +1867,12 @@ def alias_function(*args, **kwargs):
     # Add the new function to the global namespace
     globals()[function_name] = alias_function
 
-if PY2:
-    binary_types = (str, bytearray, buffer)  # noqa: F821 (buffer in Py2)
-else:
-    binary_types = (bytes, bytearray, memoryview)
+binary_types = (bytes, bytearray, memoryview)
 
 
 # ---------- Helpers (same semantics as your snippet) ----------
 def _byte_at(b, i):
     """Return int value of byte at index i for both Py2 and Py3."""
-    if PY2:
-        return ord(b[i:i+1])
     return b[i]
 
 def _is_valid_zlib_header(cmf, flg):
@@ -2070,23 +2045,20 @@ def read(self, size=-1):
                 size = 0
 
         if size == 0:
-            return b'' if not PY2 else ''
+            return b''
 
         start, end_abs = self._region_bounds()
         available = end_abs - (self._base_offset + self._pos)
         if available <= 0:
-            return b'' if not PY2 else ''
+            return b''
 
         size = min(size, available)
 
         abs_start = self._base_offset + self._pos
         abs_end = abs_start + size
 
         chunk = self._buf[abs_start:abs_end]
-        if PY2:
-            data = bytes(chunk)  # bytes() -> str in py2
-        else:
-            data = bytes(chunk)
+        data = bytes(chunk)
 
         self._pos += len(data)
         return data
@@ -2104,7 +2076,7 @@ def readline(self, size=-1):
         start, end_abs = self._region_bounds()
         remaining = end_abs - (self._base_offset + self._pos)
         if remaining <= 0:
-            return b'' if not PY2 else ''
+            return b''
 
         if size is not None and size >= 0:
             size = int(size)
@@ -2116,10 +2088,7 @@ def readline(self, size=-1):
         abs_max = abs_start + max_len
 
         # Work on a local bytes slice for easy .find()
-        if PY2:
-            buf_bytes = bytes(self._buf[abs_start:abs_max])
-        else:
-            buf_bytes = bytes(self._buf[abs_start:abs_max])
+        buf_bytes = bytes(self._buf[abs_start:abs_max])
 
         idx = buf_bytes.find(b'\n')
         if idx == -1:
@@ -2130,8 +2099,6 @@ def readline(self, size=-1):
 
         self._pos += len(line_bytes)
 
-        if PY2:
-            return line_bytes  # already str
         return line_bytes
 
     def readinto(self, b):
@@ -2278,9 +2245,6 @@ def __next__(self):
             raise StopIteration
         return line
 
-    if PY2:
-        next = __next__
-
     # ---------- misc helpers ----------
 
     def fileno(self):
@@ -2324,8 +2288,6 @@ def __init__(self, file_path=None, fileobj=None, mode='rb', level=6, wbits=15,
 
         if 'b' not in mode and 't' not in mode:
             mode += 'b'  # default to binary
-        if 'x' in mode and PY2:
-            raise ValueError("Exclusive creation mode 'x' is not supported on Python 2")
 
         self.file_path = file_path
         self.file = None
@@ -2544,9 +2506,6 @@ def __next__(self):
             raise StopIteration
         return line
 
-    if PY2:
-        next = __next__
-
     def seek(self, offset, whence=0):
         if self.closed:
             raise ValueError("I/O operation on closed file")
@@ -2584,11 +2543,9 @@ def write(self, data):
             if not isinstance(data, binary_types):
                 raise TypeError("write() expects bytes-like in binary mode")
 
-        # Normalize to bytes for Py2/3 edge cases
-        if (not PY2) and isinstance(data, memoryview):
+        # Normalize to bytes
+        if isinstance(data, memoryview):
             data = data.tobytes()
-        elif PY2 and isinstance(data, bytearray):
-            data = bytes(data)
 
         # Buffer and compress in chunks to limit memory
         self._write_buf += data
@@ -2811,8 +2768,6 @@ def __init__(self, file_path=None, fileobj=None, mode='rb',
 
         if 'b' not in mode and 't' not in mode:
             mode += 'b'
-        if 'x' in mode and PY2:
-            raise ValueError("Exclusive creation mode 'x' not supported on Python 2")
 
         self.file_path = file_path
         self.file = fileobj
@@ -3012,9 +2967,6 @@ def __next__(self):
             raise StopIteration
         return line
 
-    if PY2:
-        next = __next__
-
     def seek(self, offset, whence=0):
         if self.closed:
             raise ValueError("I/O operation on closed file")
@@ -3052,11 +3004,9 @@ def write(self, data):
             if not isinstance(data, binary_types):
                 raise TypeError("write() expects bytes-like in binary mode")
 
-        # Normalize Py3 memoryview and Py2 bytearray
-        if (not PY2) and isinstance(data, memoryview):
+        # Normalize Py3 memoryview
+        if isinstance(data, memoryview):
             data = data.tobytes()
-        elif PY2 and isinstance(data, bytearray):
-            data = bytes(data)
 
         # Stage and compress in chunks
         self._write_buf += data
@@ -8944,7 +8894,7 @@ def read(self, n=-1):
             n = len(self._mm) - self._pos
         end = min(self._pos + n, len(self._mm))
         if end <= self._pos:
-            return b"" if not PY2 else bytes_type()
+            return b""
         out = bytes(self._mm[self._pos:end])
         self._pos = end
         return out
@@ -9007,9 +8957,6 @@ def __next__(self):
             raise StopIteration
         return line
 
-    if PY2:
-        next = __next__
-
     # ---- writes ----
     def write(self, b):
         if not self._writable:
@@ -9439,7 +9386,7 @@ def CompressOpenFile(outfile, compressionenable=True, compressionlevel=None,
 
     fbasename, fextname = os.path.splitext(outfile)
     compressionlevel = 9 if compressionlevel is None else int(compressionlevel)
-    mode = "w" if PY2 else "wb"
+    mode = "wb"
 
     try:
         # Uncompressed branch
@@ -9456,10 +9403,7 @@ def CompressOpenFile(outfile, compressionenable=True, compressionlevel=None,
 
         # Compressed branches (unchanged openers; all wrapped)
         elif (fextname == ".gz" and "gzip" in compressionsupport):
-            if PY2:
-                outfp = FileLikeAdapter(GzipFile(outfile, mode=mode, level=compressionlevel), mode="wb")
-            else:
-                outfp = FileLikeAdapter(gzip.open(outfile, mode, compressionlevel), mode="wb")
+            outfp = FileLikeAdapter(gzip.open(outfile, mode, compressionlevel), mode="wb")
 
         elif (fextname == ".bz2" and "bzip2" in compressionsupport):
             outfp = FileLikeAdapter(bz2.open(outfile, mode, compressionlevel), mode="wb")