I presume most of the fixes currently hitting the tree should go into

2.2.1, but it would be nice if people remembered to comment on their
fixes' applicability!

backport akuchling's checkin of
    revision 1.26 of webchecker.py

[Bug #512799] urllib.splittype() returns a 2-tuple.  (Reported by seb bacon)

diff --git a/Tools/webchecker/webchecker.py b/Tools/webchecker/webchecker.py
index 071c2f680077c3815ec831609b1bebc8ecffee6f..470b15a101a4cb964a2018eedb7a283253a66218 100755 (executable)
--- a/Tools/webchecker/webchecker.py
+++ b/Tools/webchecker/webchecker.py
@@ -481,7 +481,7 @@ class Checker:
         if self.name_table.has_key(url):
             return self.name_table[url]
 
-        scheme = urllib.splittype(url)
+        scheme, path = urllib.splittype(url)
         if scheme in ('mailto', 'news', 'javascript', 'telnet'):
             self.note(1, " Not checking %s URL" % scheme)
             return None