From c5d0dbd328da9a193c055db96af6fb761617b7fe Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Sun, 9 Apr 2006 04:00:49 +0000 Subject: [PATCH] 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. --- Lib/telnetlib.py | 2 +- Lib/urllib.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/telnetlib.py b/Lib/telnetlib.py index 8a2513b4ef4..3523037edba 100644 --- a/Lib/telnetlib.py +++ b/Lib/telnetlib.py @@ -438,7 +438,7 @@ class Telnet: 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 diff --git a/Lib/urllib.py b/Lib/urllib.py index d1c50f61920..c1f6f60bcea 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -442,9 +442,9 @@ class URLopener: 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: