diff options
| -rw-r--r-- | Tools/faqwiz/faqwiz.py | 8 | ||||
| -rw-r--r-- | Tools/versioncheck/pyversioncheck.py | 4 | ||||
| -rwxr-xr-x | Tools/webchecker/webchecker.py | 16 | ||||
| -rwxr-xr-x | Tools/webchecker/websucker.py | 10 |
4 files changed, 19 insertions, 19 deletions
diff --git a/Tools/faqwiz/faqwiz.py b/Tools/faqwiz/faqwiz.py index 260e1aa..b9ab65d 100644 --- a/Tools/faqwiz/faqwiz.py +++ b/Tools/faqwiz/faqwiz.py @@ -138,8 +138,8 @@ def load_my_cookie(): value = cookies[COOKIE_NAME] except KeyError: return {} - import urllib - value = urllib.unquote(value) + import urllib.parse + value = urllib.parse.unquote(value) words = value.split('/') while len(words) < 3: words.append('') @@ -153,8 +153,8 @@ def load_my_cookie(): def send_my_cookie(ui): name = COOKIE_NAME value = "%s/%s/%s" % (ui.author, ui.email, ui.password) - import urllib - value = urllib.quote(value) + import urllib.parse + value = urllib.parse.quote(value) then = now + COOKIE_LIFETIME gmt = time.gmtime(then) path = os.environ.get('SCRIPT_NAME', '/cgi-bin/') diff --git a/Tools/versioncheck/pyversioncheck.py b/Tools/versioncheck/pyversioncheck.py index e5983fd..250d49d 100644 --- a/Tools/versioncheck/pyversioncheck.py +++ b/Tools/versioncheck/pyversioncheck.py @@ -1,5 +1,5 @@ """pyversioncheck - Module to help with checking versions""" -import urllib +import urllib.request import email import sys @@ -47,7 +47,7 @@ def _check1version(package, url, version, verbose=0): if verbose >= VERBOSE_EACHFILE: print(' Checking %s'%url) try: - fp = urllib.urlopen(url) + fp = urllib.request.urlopen(url) except IOError as arg: if verbose >= VERBOSE_EACHFILE: print(' Cannot open:', arg) diff --git a/Tools/webchecker/webchecker.py b/Tools/webchecker/webchecker.py index dbce678..651cf85 100755 --- a/Tools/webchecker/webchecker.py +++ b/Tools/webchecker/webchecker.py @@ -113,13 +113,13 @@ import io import getopt import pickle -import urllib -import urlparse +import urllib.request +import urllib.parse as urlparse import sgmllib import cgi import mimetypes -import robotparser +from urllib import robotparser # Extract real version number if necessary if __version__[0] == '$': @@ -487,7 +487,7 @@ class Checker: if url in self.name_table: return self.name_table[url] - scheme, path = urllib.splittype(url) + scheme, path = urllib.request.splittype(url) if scheme in ('mailto', 'news', 'javascript', 'telnet'): self.note(1, " Not checking %s URL" % scheme) return None @@ -733,13 +733,13 @@ class MyStringIO(io.StringIO): return self.__url -class MyURLopener(urllib.FancyURLopener): +class MyURLopener(urllib.request.FancyURLopener): - http_error_default = urllib.URLopener.http_error_default + http_error_default = urllib.request.URLopener.http_error_default def __init__(*args): self = args[0] - urllib.FancyURLopener.__init__(*args) + urllib.request.FancyURLopener.__init__(*args) self.addheaders = [ ('User-agent', 'Python-webchecker/%s' % __version__), ] @@ -769,7 +769,7 @@ class MyURLopener(urllib.FancyURLopener): s.write('<A HREF="%s">%s</A>\n' % (q, q)) s.seek(0) return s - return urllib.FancyURLopener.open_file(self, url) + return urllib.request.FancyURLopener.open_file(self, url) class MyHTMLParser(sgmllib.SGMLParser): diff --git a/Tools/webchecker/websucker.py b/Tools/webchecker/websucker.py index e84238e..3bbdec3 100755 --- a/Tools/webchecker/websucker.py +++ b/Tools/webchecker/websucker.py @@ -6,8 +6,8 @@ __version__ = "$Revision$" import os import sys -import urllib import getopt +import urllib.parse import webchecker @@ -87,11 +87,11 @@ class Sucker(webchecker.Checker): self.message("didn't save %s: %s", path, str(msg)) def savefilename(self, url): - type, rest = urllib.splittype(url) - host, path = urllib.splithost(rest) + type, rest = urllib.parse.splittype(url) + host, path = urllib.parse.splithost(rest) path = path.lstrip("/") - user, host = urllib.splituser(host) - host, port = urllib.splitnport(host) + user, host = urllib.parse.splituser(host) + host, port = urllib.parse.splitnport(host) host = host.lower() if not path or path[-1] == "/": path = path + "index.html" |