Changeset 1716:208cec5f1797

Timestamp:

Dec 25, 2018, 11:05:14 PM (5 months ago)

Author:

Stefan Schwarzer <sschwarzer@…>

Branch:

default

histedit_source:

11cfc2f98c21adea8ce3b9407ef189e8c561b2bf,0413bb6d5c9a453741738fe21242d768e389f8b9

Message:

Remove `socket_file_adapter.py`

This was only needed for Python 2 support, which will be removed with
ftputil 4.x.x.

Location:

ftputil

Files:

• file.py (modified) (3 diffs)
• socket_file_adapter.py (deleted)

ftputil/file.py

@@ -11 +11 @@
 import ftputil.compat
 import ftputil.error
-import ftputil.socket_file_adapter
 
 
@@ -52 +51 @@
         # pylint: disable=unused-argument
         #
-        # Python 3's `socket.makefile` supports the same interface as
-        # the new `open` builtin, but Python 2 supports only a mode,
-        # but doesn't return an object with the proper interface to
-        # wrap it in `io.TextIOWrapper`.
-        #
-        # Therefore, to make the code work on Python 2 _and_ 3, use
-        # `socket.makefile` to always create a binary file and under
-        # Python 2 wrap it in an adapter class.
-        #
         # Check mode.
         if "a" in mode:
@@ -95 +85 @@
         # `BufferedReader` or `BufferedWriter` object.
         fobj = self._conn.makefile(makefile_mode)
-        if ftputil.compat.python_version == 2:
-            BufferedIOAdapter = ftputil.socket_file_adapter.BufferedIOAdapter
-            if is_read_mode:
-                fobj = BufferedIOAdapter(fobj, is_readable=True)
-            else:
-                fobj = BufferedIOAdapter(fobj, is_writable=True)
         if not is_binary_mode:
             fobj = io.TextIOWrapper(fobj, encoding=encoding,