From b996bce3345b233d7c2a6105767d44d51ea1eb57 Mon Sep 17 00:00:00 2001 From: Charles Wesley Date: Mon, 13 Jan 2014 12:10:16 -0800 Subject: [PATCH 1/6] Fixing Python3-incompatible code --- yolk/pypi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yolk/pypi.py b/yolk/pypi.py index 3ba3ba0..be8c12b 100644 --- a/yolk/pypi.py +++ b/yolk/pypi.py @@ -164,7 +164,7 @@ def get_xmlrpc_server(self): Returns PyPI's XML-RPC server instance """ check_proxy_setting() - if os.environ.has_key('XMLRPC_DEBUG'): + if 'XMLRPC_DEBUG' in os.environ: debug = 1 else: debug = 0 @@ -275,7 +275,7 @@ def get_download_urls(self, package_name, version="", pkg_type="all"): #Try the package's metadata directly in case there's nothing #returned by XML-RPC's release_urls() - if metadata and metadata.has_key('download_url') and \ + if metadata and 'download_url' in metadata and \ metadata['download_url'] != "UNKNOWN" and \ metadata['download_url'] != None: if metadata['download_url'] not in all_urls: From efdb1e5e2bcbec1572e40dc260199ab590524ce7 Mon Sep 17 00:00:00 2001 From: Charles Wesley Date: Mon, 13 Jan 2014 12:11:49 -0800 Subject: [PATCH 2/6] fixing cPickle import for Python3 --- yolk/pypi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yolk/pypi.py b/yolk/pypi.py index be8c12b..275b06d 100644 --- a/yolk/pypi.py +++ b/yolk/pypi.py @@ -24,7 +24,7 @@ import urllib2 else: import xmlrpc.client as xmlrpclib - import pickle + import pickle as cPickle import urllib.request as urllib2 import os import time From 2e2301596d2b0fb761432574638836dd4a3c4c39 Mon Sep 17 00:00:00 2001 From: Charles Wesley Date: Mon, 13 Jan 2014 12:16:49 -0800 Subject: [PATCH 3/6] Bugfix --- yolk/pypi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yolk/pypi.py b/yolk/pypi.py index 275b06d..e7a1db3 100644 --- a/yolk/pypi.py +++ b/yolk/pypi.py @@ -203,13 +203,13 @@ def query_cached_package_list(self): """Return list of pickled package names from PYPI""" if self.debug: self.logger.debug("DEBUG: reading pickled cache file") - return cPickle.load(open(self.pkg_cache_file, "r")) + return cPickle.load(open(self.pkg_cache_file, "rb")) def fetch_pkg_list(self): """Fetch and cache master list of package names from PYPI""" self.logger.debug("DEBUG: Fetching package name list from PyPI") package_list = self.list_packages() - cPickle.dump(package_list, open(self.pkg_cache_file, "w")) + cPickle.dump(package_list, open(self.pkg_cache_file, "wb")) self.pkg_list = package_list def search(self, spec, operator): From 5203b83a7fcf90441f84ec2f851b6ade6fbe8459 Mon Sep 17 00:00:00 2001 From: Charles Wesley Date: Mon, 13 Jan 2014 12:25:37 -0800 Subject: [PATCH 4/6] changed for python2 compatibility --- yolk/pypi.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/yolk/pypi.py b/yolk/pypi.py index e7a1db3..59a076c 100644 --- a/yolk/pypi.py +++ b/yolk/pypi.py @@ -203,13 +203,19 @@ def query_cached_package_list(self): """Return list of pickled package names from PYPI""" if self.debug: self.logger.debug("DEBUG: reading pickled cache file") - return cPickle.load(open(self.pkg_cache_file, "rb")) + if platform.python_version().startswith('2'): + return cPickle.load(open(self.pkg_cache_file, "r")) + else: + return cPickle.load(open(self.pkg_cache_file, "rb")) def fetch_pkg_list(self): """Fetch and cache master list of package names from PYPI""" self.logger.debug("DEBUG: Fetching package name list from PyPI") package_list = self.list_packages() - cPickle.dump(package_list, open(self.pkg_cache_file, "wb")) + if platform.python_version().startswith('2'): + cPickle.dump(package_list, open(self.pkg_cache_file, "w")) + else: + cPickle.dump(package_list, open(self.pkg_cache_file, "wb")) self.pkg_list = package_list def search(self, spec, operator): From ea6e1bdae67cfdcde22853899bb9fa05146a18db Mon Sep 17 00:00:00 2001 From: Charles Wesley Date: Mon, 13 Jan 2014 12:31:43 -0800 Subject: [PATCH 5/6] auto-upgrade pkg_list --- yolk/pypi.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/yolk/pypi.py b/yolk/pypi.py index 59a076c..4e8d3dd 100644 --- a/yolk/pypi.py +++ b/yolk/pypi.py @@ -203,19 +203,24 @@ def query_cached_package_list(self): """Return list of pickled package names from PYPI""" if self.debug: self.logger.debug("DEBUG: reading pickled cache file") - if platform.python_version().startswith('2'): - return cPickle.load(open(self.pkg_cache_file, "r")) - else: + try: return cPickle.load(open(self.pkg_cache_file, "rb")) + except ValueError: + return cPickle.load(open(self.pkg_cache_file, "r")) + # if platform.python_version().startswith('2'): + # return cPickle.load(open(self.pkg_cache_file, "r")) + # else: + # return cPickle.load(open(self.pkg_cache_file, "rb")) def fetch_pkg_list(self): """Fetch and cache master list of package names from PYPI""" self.logger.debug("DEBUG: Fetching package name list from PyPI") package_list = self.list_packages() - if platform.python_version().startswith('2'): - cPickle.dump(package_list, open(self.pkg_cache_file, "w")) - else: - cPickle.dump(package_list, open(self.pkg_cache_file, "wb")) + cPickle.dump(package_list, open(self.pkg_cache_file, "wb")) + # if platform.python_version().startswith('2'): + # cPickle.dump(package_list, open(self.pkg_cache_file, "w")) + # else: + # cPickle.dump(package_list, open(self.pkg_cache_file, "wb")) self.pkg_list = package_list def search(self, spec, operator): From 15d0666431dcc7bb1716b978cf7602fb2dd0e17a Mon Sep 17 00:00:00 2001 From: Charles Wesley Date: Mon, 13 Jan 2014 12:34:52 -0800 Subject: [PATCH 6/6] Cleaning up comments --- yolk/pypi.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/yolk/pypi.py b/yolk/pypi.py index 4e8d3dd..ca264a1 100644 --- a/yolk/pypi.py +++ b/yolk/pypi.py @@ -207,20 +207,12 @@ def query_cached_package_list(self): return cPickle.load(open(self.pkg_cache_file, "rb")) except ValueError: return cPickle.load(open(self.pkg_cache_file, "r")) - # if platform.python_version().startswith('2'): - # return cPickle.load(open(self.pkg_cache_file, "r")) - # else: - # return cPickle.load(open(self.pkg_cache_file, "rb")) def fetch_pkg_list(self): """Fetch and cache master list of package names from PYPI""" self.logger.debug("DEBUG: Fetching package name list from PyPI") package_list = self.list_packages() cPickle.dump(package_list, open(self.pkg_cache_file, "wb")) - # if platform.python_version().startswith('2'): - # cPickle.dump(package_list, open(self.pkg_cache_file, "w")) - # else: - # cPickle.dump(package_list, open(self.pkg_cache_file, "wb")) self.pkg_list = package_list def search(self, spec, operator):