[Python-checkins] r71331 - in python/branches/release26-maint: Lib/socket.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Tue Apr  7 00:11:57 2009
New Revision: 71331

Log:
Merged revisions 71329 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71329 | benjamin.peterson | 2009-04-06 16:53:33 -0500 (Mon, 06 Apr 2009) | 1 line
  
  add create_connection to __all__ #5711
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/socket.py

Modified: python/branches/release26-maint/Lib/socket.py
==============================================================================
--- python/branches/release26-maint/Lib/socket.py	(original)
+++ python/branches/release26-maint/Lib/socket.py	Tue Apr  7 00:11:57 2009
@@ -88,7 +88,7 @@
 except ImportError:
     EBADF = 9
 
-__all__ = ["getfqdn"]
+__all__ = ["getfqdn", "create_connection"]
 __all__.extend(os._get_exports_list(_socket))