commit ed52a20c6eb451cd8827e3901f115709980edaae
author Guido van Rossum <guido@python.org> Tue Feb 16 15:10:12 1999 +0000
committer Guido van Rossum <guido@python.org> Tue Feb 16 15:10:12 1999 +0000
tree f4a8afe0da344d4cfea126d549296d6780a3a6fe
parent b8c3cbdd50badf2ecf5da9d62a91959162695fa1

In open_ftp(), check that retrlen is not None before using it in a %d format!

Lib/urllib.py

diff --git a/Lib/urllib.py b/Lib/urllib.py
index d175eef..d37906c 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -387,7 +387,7 @@
 				   value in ('a', 'A', 'i', 'I', 'd', 'D'):
 					type = string.upper(value)
                         (fp, retrlen) = self.ftpcache[key].retrfile(file, type)
-                        if retrlen >= 0:
+                        if retrlen is not None and retrlen >= 0:
                             import mimetools, StringIO
                             headers = mimetools.Message(StringIO.StringIO(
                                 'Content-Length: %d\n' % retrlen))