Changeset 1674:b2e19844d663

Timestamp:

Oct 28, 2017, 6:25:26 PM (16 months ago)

Author:

Stefan Schwarzer <sschwarzer@…>

Branch:

default

Message:

Catch `EOFError` in `_available_child`

If `host._session.pwd` raises an `EOFError`, catch it and don't
consider the affected child host for a new file-like object.

Files:

• ftputil/host.py (modified) (1 diff)
• test/test_file.py (modified) (1 diff)

ftputil/host.py

@@ -181 +181 @@
                 # an FTP session timeout.
                 except OSError:
+                    continue
+                # The server may close the connection which may cause
+                # `host._session.getline` raise an `EOFError` (see
+                # ticket #114).
+                except EOFError:
                     continue
                 else:

test/test_file.py

@@ -282 +282 @@
         """
         self._test_with_pwd_error(OSError)
+
+    def test_pwd_with_EOFError(self):
+        """
+        Test if an `EOFError` in `_session.pwd` skips the child
+        session.
+        """
+        self._test_with_pwd_error(EOFError)