[Python-checkins] r43740 - python/trunk/Lib/telnetlib.py python/trunk/Lib/urllib.py

[neal.norwitz]

Author: neal.norwitz
Date: Sun Apr  9 06:00:49 2006
New Revision: 43740

Modified:
   python/trunk/Lib/telnetlib.py
   python/trunk/Lib/urllib.py
Log:
Fix a couple of strings that were no-ops.  urllib.open_file was a docstring
in 2.4, so put it back.  The string in telnetlib looks like a comment.


Modified: python/trunk/Lib/telnetlib.py
==============================================================================
--- python/trunk/Lib/telnetlib.py	(original)
+++ python/trunk/Lib/telnetlib.py	Sun Apr  9 06:00:49 2006
@@ -438,7 +438,7 @@
                     else:
                         self.iacseq += c
                 elif len(self.iacseq) == 1:
-                    'IAC: IAC CMD [OPTION only for WILL/WONT/DO/DONT]'
+                    # 'IAC: IAC CMD [OPTION only for WILL/WONT/DO/DONT]'
                     if c in (DO, DONT, WILL, WONT):
                         self.iacseq += c
                         continue

Modified: python/trunk/Lib/urllib.py
==============================================================================
--- python/trunk/Lib/urllib.py	(original)
+++ python/trunk/Lib/urllib.py	Sun Apr  9 06:00:49 2006
@@ -442,9 +442,9 @@
         return addinfourl(fp, noheaders(), "gopher:" + url)
 
     def open_file(self, url):
+        """Use local file or FTP depending on form of URL."""
         if not isinstance(url, str):
             raise IOError, ('file error', 'proxy support for file protocol currently not implemented')
-        """Use local file or FTP depending on form of URL."""
         if url[:2] == '//' and url[2:3] != '/' and url[2:12].lower() != 'localhost/':
             return self.open_ftp(url)
         else: