tracker issue 1671:

http://bugs.python.org/issue1671

In addition to updating the code for Py3k, this updates ccTLDs to their
10-Oct-2006 revision.

(Minor stylistic additions and whitespace normalization by Barry.)