summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2006-04-09 04:00:49 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2006-04-09 04:00:49 (GMT)
commitc5d0dbd328da9a193c055db96af6fb761617b7fe (patch)
tree48bc939cb8a5c34c92a96997a2259cc0086d754d /Lib
parenta31bf18c48654640b7020e8900928f9db862a1a5 (diff)
downloadcpython-c5d0dbd328da9a193c055db96af6fb761617b7fe.zip
cpython-c5d0dbd328da9a193c055db96af6fb761617b7fe.tar.gz
cpython-c5d0dbd328da9a193c055db96af6fb761617b7fe.tar.bz2
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.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/telnetlib.py2
-rw-r--r--Lib/urllib.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/telnetlib.py b/Lib/telnetlib.py
index 8a2513b..3523037 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 d1c50f6..c1f6f60 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: