diff options
| author | Giampaolo Rodolà <g.rodola@gmail.com> | 2010-08-21 20:34:37 (GMT) |
|---|---|---|
| committer | Giampaolo Rodolà <g.rodola@gmail.com> | 2010-08-21 20:34:37 (GMT) |
| commit | 6545ed6e4fd5f31798aaa7789b08ae925203d33e (patch) | |
| tree | 2b39257bd29befd1ccec6f195087dba706efc57f /Lib/ftplib.py | |
| parent | 2d55e2aab32b41004ef5c7b99fdcdeeb96611166 (diff) | |
| download | cpython-6545ed6e4fd5f31798aaa7789b08ae925203d33e.zip cpython-6545ed6e4fd5f31798aaa7789b08ae925203d33e.tar.gz cpython-6545ed6e4fd5f31798aaa7789b08ae925203d33e.tar.bz2 | |
remove obsolete 'import SOCKS' statement
Diffstat (limited to 'Lib/ftplib.py')
| -rw-r--r-- | Lib/ftplib.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Lib/ftplib.py b/Lib/ftplib.py index b593fa1..8a097c0 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -38,13 +38,7 @@ python ftplib.py -d localhost -l -p -l import os import sys - -# Import SOCKS module if it exists, else standard socket module socket -try: - import SOCKS; socket = SOCKS; del SOCKS # import SOCKS as socket - from socket import getfqdn; socket.getfqdn = getfqdn; del getfqdn -except ImportError: - import socket +import socket from socket import _GLOBAL_DEFAULT_TIMEOUT __all__ = ["FTP","Netrc"] |