mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 08:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Patch by Andrew Straw: use urllib2 so proxie access works.

Browse source
This commit is contained in:
Jack Jansen 2003-03-11 14:37:19 +00:00
parent f9e0bd8df8
commit 47e5987256
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/plat-mac/pimp.py
View file

@ -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()