Make py3compat drop its own changelog entry, and nix the file itself

NOTE: imports not fixed yet so this will break CI!

2 files changed, 7 insertions, 190 deletions

diff --git a/paramiko/py3compat.py b/paramiko/py3compat.py
deleted file mode 100644
index d6d136fb..00000000
--- a/paramiko/py3compat.py
+++ /dev/null
@@ -1,185 +0,0 @@
-import base64
-import sys
-import time
-
-__all__ = [
-    "BytesIO",
-    "MAXSIZE",
-    "PY2",
-    "StringIO",
-    "b",
-    "b2s",
-    "builtins",
-    "byte_chr",
-    "byte_mask",
-    "byte_ord",
-    "bytes",
-    "bytes_types",
-    "decodebytes",
-    "encodebytes",
-    "input",
-    "integer_types",
-    "is_callable",
-    "long",
-    "next",
-    "string_types",
-    "text_type",
-    "u",
-]
-
-PY2 = sys.version_info[0] < 3
-
-if PY2:
-    import __builtin__ as builtins
-    import locale
-
-    string_types = basestring  # NOQA
-    text_type = unicode  # NOQA
-    bytes_types = str
-    bytes = str
-    integer_types = (int, long)  # NOQA
-    long = long  # NOQA
-    input = raw_input  # NOQA
-    decodebytes = base64.decodestring
-    encodebytes = base64.encodestring
-
-    def bytestring(s):  # NOQA
-        if isinstance(s, unicode):  # NOQA
-            return s.encode("utf-8")
-        return s
-
-    byte_ord = ord  # NOQA
-    byte_chr = chr  # NOQA
-
-    def byte_mask(c, mask):
-        return chr(ord(c) & mask)
-
-    def b(s, encoding="utf8"):  # NOQA
-        """cast unicode or bytes to bytes"""
-        if isinstance(s, str):
-            return s
-        elif isinstance(s, unicode):  # NOQA
-            return s.encode(encoding)
-        elif isinstance(s, buffer):  # NOQA
-            return s
-        else:
-            raise TypeError("Expected unicode or bytes, got {!r}".format(s))
-
-    def u(s, encoding="utf8"):  # NOQA
-        """cast bytes or unicode to unicode"""
-        if isinstance(s, str):
-            return s.decode(encoding)
-        elif isinstance(s, unicode):  # NOQA
-            return s
-        elif isinstance(s, buffer):  # NOQA
-            return s.decode(encoding)
-        else:
-            raise TypeError("Expected unicode or bytes, got {!r}".format(s))
-
-    def b2s(s):
-        return s
-
-    import cStringIO
-
-    StringIO = cStringIO.StringIO
-    BytesIO = StringIO
-
-    def is_callable(c):  # NOQA
-        return callable(c)
-
-    def get_next(c):  # NOQA
-        return c.next
-
-    def next(c):
-        return c.next()
-
-    # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
-    class X(object):
-        def __len__(self):
-            return 1 << 31
-
-    try:
-        len(X())
-    except OverflowError:
-        # 32-bit
-        MAXSIZE = int((1 << 31) - 1)  # NOQA
-    else:
-        # 64-bit
-        MAXSIZE = int((1 << 63) - 1)  # NOQA
-    del X
-
-    def strftime(format, t):
-        """Same as time.strftime but returns unicode."""
-        _, encoding = locale.getlocale(locale.LC_TIME)
-        return time.strftime(format, t).decode(encoding or "ascii")
-
-
-else:
-    import collections
-    import struct
-    import builtins
-
-    string_types = str
-    text_type = str
-    bytes = bytes
-    bytes_types = bytes
-    integer_types = int
-
-    class long(int):
-        pass
-
-    input = input
-    decodebytes = base64.decodebytes
-    encodebytes = base64.encodebytes
-
-    def byte_ord(c):
-        # In case we're handed a string instead of an int.
-        if not isinstance(c, int):
-            c = ord(c)
-        return c
-
-    def byte_chr(c):
-        assert isinstance(c, int)
-        return struct.pack("B", c)
-
-    def byte_mask(c, mask):
-        assert isinstance(c, int)
-        return struct.pack("B", c & mask)
-
-    def b(s, encoding="utf8"):
-        """cast unicode or bytes to bytes"""
-        if isinstance(s, bytes):
-            return s
-        elif isinstance(s, str):
-            return s.encode(encoding)
-        else:
-            raise TypeError("Expected unicode or bytes, got {!r}".format(s))
-
-    def u(s, encoding="utf8"):
-        """cast bytes or unicode to unicode"""
-        if isinstance(s, bytes):
-            return s.decode(encoding)
-        elif isinstance(s, str):
-            return s
-        else:
-            raise TypeError("Expected unicode or bytes, got {!r}".format(s))
-
-    def b2s(s):
-        return s.decode() if isinstance(s, bytes) else s
-
-    import io
-
-    StringIO = io.StringIO  # NOQA
-    BytesIO = io.BytesIO  # NOQA
-
-    def is_callable(c):
-        return isinstance(c, collections.Callable)
-
-    def get_next(c):
-        return c.__next__
-
-    next = next
-
-    MAXSIZE = sys.maxsize  # NOQA
-
-    strftime = time.strftime  # NOQA
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 0c4ee192..52b68056 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,13 @@
 Changelog
 =========
 
+- :support:`-` Remove the now irrelevant ``paramiko.py3compat`` module.
+
+  .. warning::
+    This change is backwards incompatible if you were importing anything from
+    this module. Such references should be easily search-and-replaced with
+    their modern Python 3.6+ equivalents.
+
 - :support:`-` Drop support for Python versions less than 3.6, including Python
   2. So long and thanks for all the fish!
 
@@ -11,11 +18,6 @@ Changelog
     ``python_requires``, so this should not cause breakage unless you're on an
     old installation method that can't read this metadata.
 
-  .. warning::
-    As part of this change, ``paramiko.py3compat`` has been entirely removed.
-    Any methods you were using from that module should be easily
-    search-and-replaced with their modern Python 3.6+ equivalents as necessary.
-
 - :release:`2.12.0 <2022-11-04>`
 - :feature:`2125` (also re: :issue:`2054`) Add a ``transport_factory`` kwarg to
   `SSHClient.connect <paramiko.client.SSHClient.connect>` for advanced