From: Giampaolo Rodolà <g.rodola@gmail.com>
Date: Sat, 21 Aug 2010 20:34:37 +0000 (+0000)
Subject: remove obsolete 'import SOCKS' statement
X-Git-Tag: v3.2a2~179
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6545ed6e4fd5f31798aaa7789b08ae925203d33e;p=thirdparty%2FPython%2Fcpython.git

remove obsolete 'import SOCKS' statement
---

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index b593fa1e76c1..8a097c03657b 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"]