diff --git a/Lib/plat-mac/pimp.py b/Lib/plat-mac/pimp.py index c5cf45eb3565d9e74d8f60546c267e3ace3a8996..426177aad61aceed46397eff44fd1b257d37216e 100644 --- a/Lib/plat-mac/pimp.py +++ b/Lib/plat-mac/pimp.py @@ -15,6 +15,7 @@ intention is that the end user will use this through a GUI. import sys import os import urllib +import urllib2 import urlparse import plistlib import distutils.util @@ -49,11 +50,6 @@ ARCHIVE_FORMATS = [ (".zip", "unzip \"%s\""), ] -class MyURLopener(urllib.FancyURLopener): - """Like FancyURLOpener, but we do want to get errors as exceptions.""" - def http_error_default(self, url, fp, errcode, errmsg, headers): - urllib.URLopener.http_error_default(self, url, fp, errcode, errmsg, headers) - class PimpPreferences: """Container for per-user preferences, such as the database to use and where to install packages.""" @@ -149,7 +145,7 @@ class PimpDatabase: if url in self._urllist: return self._urllist.append(url) - fp = MyURLopener().open(url).fp + fp = urllib2.urlopen(url).fp dict = plistlib.Plist.fromFile(fp) # Test here for Pimp version, etc if not included: @@ -798,4 +794,4 @@ def main(): if __name__ == '__main__': main() - \ No newline at end of file +