[Python-checkins] r84247 - python/branches/py3k/Lib/ftplib.py

[giampaolo.rodola]

Author: giampaolo.rodola
Date: Sat Aug 21 22:34:37 2010
New Revision: 84247

Log:
remove obsolete 'import SOCKS' statement

Modified:
   python/branches/py3k/Lib/ftplib.py

Modified: python/branches/py3k/Lib/ftplib.py
==============================================================================
--- python/branches/py3k/Lib/ftplib.py	(original)
+++ python/branches/py3k/Lib/ftplib.py	Sat Aug 21 22:34:37 2010
@@ -38,13 +38,7 @@
 
 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"]