From 7ffe08ef8185d87c0dfff1d5567f9d84f8e47ba7 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 17 Nov 2015 17:19:48 -0500 Subject: Remove unnecessary __init__ --- scripts/upload-old-releases-as-zip.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/upload-old-releases-as-zip.py b/scripts/upload-old-releases-as-zip.py index c7c89fa7..1a638720 100644 --- a/scripts/upload-old-releases-as-zip.py +++ b/scripts/upload-old-releases-as-zip.py @@ -14,6 +14,7 @@ import os import shutil import tarfile import tempfile +import codecs import urllib.request import urllib.parse import urllib.error @@ -32,7 +33,6 @@ class SetuptoolsOldReleasesWithoutZip(object): """docstring for SetuptoolsOldReleases""" def __init__(self): - super(SetuptoolsOldReleasesWithoutZip, self).__init__() self.dirpath = tempfile.mkdtemp(prefix=DISTRIBUTION) print("Downloading %s releases..." % DISTRIBUTION) print("All releases will be downloaded to %s" % self.dirpath) @@ -117,7 +117,10 @@ class SetuptoolsOldReleasesWithoutZip(object): ], """ url = "https://pypi.python.org/pypi/%s/json" % (package_name,) - data = json.load(urllib.request.urlopen(urllib.request.Request(url))) + resp = urllib.request.urlopen(urllib.request.Request(url)) + charset = resp.info().get_content_charset() + reader = codecs.getreader(charset)(resp) + data = json.load(reader) # Mainly for debug. json_filename = "%s/%s.json" % (self.dirpath, DISTRIBUTION) -- cgit v1.2.1