From aef26744334da5ef552764216284640e34092da9 Mon Sep 17 00:00:00 2001 From: Rob Cakebread Date: Tue, 7 Feb 2012 10:32:05 -0800 Subject: [PATCH 01/14] Prep for Jenkins --- tox.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index 2d6fef2..f9cd6f2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] -envlist = py25,py27 +envlist = py26 [testenv] -deps=nose -commands= - nosetests {posargs} +changedir=tests +deps=pytest +commands=py.test --junitxml=junit-{envname}.xml From e571ad486caf0b03f6d4b379e95d95a18215e62f Mon Sep 17 00:00:00 2001 From: Rob Cakebread Date: Tue, 7 Feb 2012 10:42:49 -0800 Subject: [PATCH 02/14] Remove nose dep --- tests/test_yolk_cli.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_yolk_cli.py b/tests/test_yolk_cli.py index 7c8d545..7f217a9 100644 --- a/tests/test_yolk_cli.py +++ b/tests/test_yolk_cli.py @@ -1,4 +1,3 @@ -from nose import SkipTest class TestStdOut: def test_object_initialization(self): From 7437163c20dd5d52b5fe1400667863f2f7d2652c Mon Sep 17 00:00:00 2001 From: Rob Cakebread Date: Tue, 21 Feb 2012 12:15:07 -0800 Subject: [PATCH 03/14] Use pybrew for jenkins user --- tox.ini | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index f9cd6f2..09ff6fc 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,14 @@ [tox] -envlist = py26 +envlist = py267,py271 [testenv] changedir=tests deps=pytest commands=py.test --junitxml=junit-{envname}.xml +[testenv:py271] +basepython=/var/lib/jenkins/.pythonbrew/pythons/Python-2.7.1/ + +[testenv:py267] +basepython=/var/lib/jenkins/.pythonbrew/pythons/Python-2.6.7/ + From d64785b69b66e26df3b858c82860e29a443147fd Mon Sep 17 00:00:00 2001 From: Rob Cakebread Date: Tue, 21 Feb 2012 12:17:54 -0800 Subject: [PATCH 04/14] Fix bin path --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 09ff6fc..d7a20a9 100644 --- a/tox.ini +++ b/tox.ini @@ -6,9 +6,9 @@ deps=pytest commands=py.test --junitxml=junit-{envname}.xml [testenv:py271] -basepython=/var/lib/jenkins/.pythonbrew/pythons/Python-2.7.1/ +basepython=/var/lib/jenkins/.pythonbrew/pythons/Python-2.7.1/bin/python2.7 [testenv:py267] -basepython=/var/lib/jenkins/.pythonbrew/pythons/Python-2.6.7/ +basepython=/var/lib/jenkins/.pythonbrew/pythons/Python-2.6.7/bin/python2.6 From 30f8362ef9815025e47f1f996442bb77c5e1425b Mon Sep 17 00:00:00 2001 From: Rob Cakebread Date: Tue, 21 Feb 2012 12:36:58 -0800 Subject: [PATCH 05/14] Added 2.7.2 support --- tox.ini | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index d7a20a9..4a6939e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,13 @@ [tox] -envlist = py267,py271 +envlist = py267,py271,py272 [testenv] changedir=tests deps=pytest commands=py.test --junitxml=junit-{envname}.xml +[testenv:py272] +basepython=/var/lib/jenkins/.pythonbrew/pythons/Python-2.7.2/bin/python2.7 + [testenv:py271] basepython=/var/lib/jenkins/.pythonbrew/pythons/Python-2.7.1/bin/python2.7 From aa84365977c73bdc9cc8f0cd13e937be485e4673 Mon Sep 17 00:00:00 2001 From: Rob Cakebread Date: Tue, 21 Feb 2012 14:26:04 -0800 Subject: [PATCH 06/14] 3.2.1 tests --- tox.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tox.ini b/tox.ini index 4a6939e..078fd25 100644 --- a/tox.ini +++ b/tox.ini @@ -5,6 +5,10 @@ changedir=tests deps=pytest commands=py.test --junitxml=junit-{envname}.xml +[testenv:py321] +basepython=/var/lib/jenkins/.pythonbrew/pythons/Python-3.2.1/bin/python3.2 + + [testenv:py272] basepython=/var/lib/jenkins/.pythonbrew/pythons/Python-2.7.2/bin/python2.7 From 9a465b68ef7ea3682531c928c58f2e5458ab04d1 Mon Sep 17 00:00:00 2001 From: Rob Cakebread Date: Tue, 21 Feb 2012 14:28:01 -0800 Subject: [PATCH 07/14] Tox python 3.2.1 support --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 078fd25..da0c6d1 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py267,py271,py272 +envlist = py267,py271,py272,py321 [testenv] changedir=tests deps=pytest From e3a04ee6b16547e83b625e7d6cf3bab8da1926ad Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Tue, 28 Feb 2012 19:44:03 +0200 Subject: [PATCH 08/14] Classes should inherit from object. --- yolk/yolklib.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yolk/yolklib.py b/yolk/yolklib.py index 754515f..cb70059 100755 --- a/yolk/yolklib.py +++ b/yolk/yolklib.py @@ -1,4 +1,3 @@ - ''' yolklib.py @@ -21,7 +20,7 @@ -class Distributions: +class Distributions(object): """Helper class for pkg_resources""" From 3dc844707169578ddf4653ac18d9af23dd8f52c4 Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Tue, 28 Feb 2012 19:45:58 +0200 Subject: [PATCH 09/14] Classes should inherit from object. --- yolk/pypi.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yolk/pypi.py b/yolk/pypi.py index 2c8f71d..3cc35f0 100644 --- a/yolk/pypi.py +++ b/yolk/pypi.py @@ -1,4 +1,3 @@ - """ pypi.py @@ -90,7 +89,7 @@ def check_proxy_setting(): return -class CheeseShop: +class CheeseShop(object): """Interface to Python Package Index""" From 7b2434d6eff9a611782c562acf0e84cda85a8d5b Mon Sep 17 00:00:00 2001 From: Rob Cakebread Date: Thu, 1 Mar 2012 10:46:44 -0800 Subject: [PATCH 10/14] Testing github/jenkins commit hooks --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ae1e9d9..eb45c5b 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ long_description=open("README", "r").read(), maintainer="Rob Cakebread", author="Rob Cakebread", - author_email="cakebread @ gmail", + author_email="cakebread @ gmail dot com", url="https://github.com/cakebread/yolk", keywords="PyPI setuptools cheeseshop distutils eggs package management", classifiers=["Development Status :: 4 - Beta", From 09a4d44783cafbc6a3703b307f54beabb02b4d77 Mon Sep 17 00:00:00 2001 From: Bobby Impollonia Date: Sat, 3 Mar 2012 09:42:25 -0800 Subject: [PATCH 11/14] Fix #3 xmlrpc bug in python 2.7.1 Merge patch from https://bitbucket.org/dbinit/yolk/ that modifies urllib2.addinfourl to add getheader() method needed to avoid AttributeError in xmlrpclib --- yolk/pypi.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/yolk/pypi.py b/yolk/pypi.py index 2c8f71d..ae9f1d9 100644 --- a/yolk/pypi.py +++ b/yolk/pypi.py @@ -23,6 +23,7 @@ import time import logging import urllib2 +import httplib from yolk.utils import get_yolk_dir @@ -32,6 +33,27 @@ #XML_RPC_SERVER = 'http://cheeseshop.python.org/simple' +class addinfourl(urllib2.addinfourl): + """ + Replacement addinfourl class compatible with python-2.7's xmlrpclib + + In python-2.7, xmlrpclib expects that the response object that it receives + has a getheader method. httplib.HTTPResponse provides this but + urllib2.addinfourl does not. Add the necessary functions here, ported to + use the internal data structures of addinfourl. + """ + def getheader(self, name, default=None): + if self.headers is None: + raise httplib.ResponseNotReady() + return self.headers.getheader(name, default) + + def getheaders(self): + if self.headers is None: + raise httplib.ResponseNotReady() + return self.headers.items() +urllib2.addinfourl = addinfourl + + class ProxyTransport(xmlrpclib.Transport): """ Provides an XMl-RPC transport routing via a http proxy. From 3dd2ffc8abc316c0953c40482e0402dde6d1046b Mon Sep 17 00:00:00 2001 From: Scott Maxwell Date: Wed, 12 Dec 2012 09:16:38 -0800 Subject: [PATCH 12/14] Minimal changes to allow running on Py3K Change all has_key() to "key in container" form Catch exception from gettype() in HTTPMessage and try get_content_type since this object completely changed in Py3K Change print to a function Fix pickle import so it works on Py2 and Py3 Import httplib or http.client for required exception classes Change pickle files to binary Use temp file.TemporaryFile instead of os.tmpfile on Py3K --- yolk/cli.py | 14 +++++++++----- yolk/pypi.py | 17 +++++++++-------- yolk/utils.py | 8 ++++++-- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/yolk/cli.py b/yolk/cli.py index f7354c6..7ea6a9e 100755 --- a/yolk/cli.py +++ b/yolk/cli.py @@ -62,7 +62,7 @@ def __init__(self, stream, modulenames): self.modulenames = modulenames def __getattr__(self, attribute): - if not self.__dict__.has_key(attribute) or attribute == '__doc__': + if attribute not in self.__dict__ or attribute == '__doc__': return getattr(self.stdout, attribute) return self.__dict__[attribute] @@ -612,8 +612,12 @@ def fetch_uri(self, directory, uri): % (filename, uri)) self.logger.error(str(err_msg)) return 1 + try: + content_type = headers.gettype() + except AttributeError: + content_type = headers.get_content_type() - if headers.gettype() in ["text/html"]: + if content_type == "text/html": dfile = open(downloaded_filename) if re.search("404 Not Found", "".join(dfile.readlines())): dfile.close() @@ -672,14 +676,14 @@ def browse_website(self, browser=None): metadata = self.pypi.release_data(self.project_name, \ self.all_versions[0]) self.logger.debug("DEBUG: browser: %s" % browser) - if metadata.has_key("home_page"): + if "home_page" in metadata: self.logger.info("Launching browser: %s" \ % metadata["home_page"]) if browser == 'konqueror': browser = webbrowser.Konqueror() else: browser = webbrowser.get() - browser.open(metadata["home_page"], 2) + browser.open(metadata["home_page"], 2) return 0 self.logger.error("No homepage URL found.") @@ -870,7 +874,7 @@ def show_entry_points(self): print(" %s" % entry_point) if plugin.__doc__: print(plugin.__doc__) - print + print() except ImportError: pass if not found: diff --git a/yolk/pypi.py b/yolk/pypi.py index 3ba3ba0..380a819 100644 --- a/yolk/pypi.py +++ b/yolk/pypi.py @@ -20,16 +20,17 @@ import platform if platform.python_version().startswith('2'): import xmlrpclib - import cPickle + import cPickle as pickle import urllib2 + import httplib else: import xmlrpc.client as xmlrpclib import pickle import urllib.request as urllib2 + import http.client as httplib import os import time import logging -import urllib from yolk.utils import get_yolk_dir @@ -164,7 +165,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 @@ -203,13 +204,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 pickle.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")) + pickle.dump(package_list, open(self.pkg_cache_file, "wb")) self.pkg_list = package_list def search(self, spec, operator): @@ -275,9 +276,9 @@ 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 \ - metadata['download_url'] != "UNKNOWN" and \ - metadata['download_url'] != None: + if metadata and 'download_url' in metadata and\ + metadata['download_url'] != "UNKNOWN" and\ + metadata['download_url'] is not None: if metadata['download_url'] not in all_urls: if pkg_type != "all": url = filter_url(pkg_type, metadata['download_url']) diff --git a/yolk/utils.py b/yolk/utils.py index 3b40ccf..cb85fff 100644 --- a/yolk/utils.py +++ b/yolk/utils.py @@ -17,7 +17,11 @@ import signal import time from subprocess import Popen, STDOUT - +import platform +if platform.python_version().startswith('2'): + from os import tmpfile +else: + from tempfile import TemporaryFile as tmpfile def get_yolk_dir(): @@ -34,7 +38,7 @@ def run_command(cmd, env=None, max_timeout=None): """ arglist = cmd.split() - output = os.tmpfile() + output = tmpfile() try: pipe = Popen(arglist, stdout=output, stderr=STDOUT, env=env) except Exception as errmsg: From 61f51519ba4dc304e4b70a998019a47960b68ae7 Mon Sep 17 00:00:00 2001 From: Scott Maxwell Date: Mon, 6 Oct 2014 08:09:33 -0700 Subject: [PATCH 13/14] Fix for Python 3 --- README.rst | 20 ++++++++++---------- tests/rss_feed.py | 23 ++++++++++++----------- yolk/cli.py | 37 ++++++++++++++++--------------------- yolk/pypi.py | 11 +++++++---- yolk/utils.py | 2 +- yolk/yolklib.py | 11 +++++------ 6 files changed, 51 insertions(+), 53 deletions(-) diff --git a/README.rst b/README.rst index aadc8f2..f5be8ab 100644 --- a/README.rst +++ b/README.rst @@ -14,7 +14,7 @@ As of 0.0.7 yolk is in Gentoo's Portage tree as dev-python/yolk and a plugin for Summary ------- -Yolk is a Python tool for obtaining information about installed Python packages and querying packages avilable on PyPI (Python Package Index). +Yolk is a Python tool for obtaining information about installed Python packages and querying packages available on PyPI (Python Package Index). You can see which packages are active, non-active or in development mode and show you which have newer versions available by querying PyPI. @@ -28,7 +28,7 @@ Usage Examples:: $ yolk -n List only the non-activated (--multi-version) packages installed - + $ yolk -l -f License,Author nose==1.0 Show the license and author for version 1.0 of the package `nose` @@ -94,21 +94,21 @@ Changes **0.4.3**: Added missing documentation and license files - + **0.4.2**: Fix for -C when an integer isn't supplied - + Fix for --entry-map from Jesus Rivero (Neurogeek) neurogeek@gentoo.org. Thanks, Jesus! - - Switch to BSD license from GPL-2 + + Switch to BSD license from GPL-2 **0.4.1**: Fix for -f fields - + Add check for integer with -L **0.4.0**: Added http proxy support for XML-RPC - + Added case-insensitive search for -f Non-existent packages with -S no longer show entire index (bug was with PyPI) @@ -130,7 +130,7 @@ Changes Removed dependency on elementtree - + **0.2.0**: Added 'svn' type for -T A kablillion bug fixes @@ -148,7 +148,7 @@ Changes **0.0.7**: New options: --entry-map and -entry-points - + Improved results with --download-links New plugin system. First plugin available: yolk-portage diff --git a/tests/rss_feed.py b/tests/rss_feed.py index 9f21e98..bb32f60 100755 --- a/tests/rss_feed.py +++ b/tests/rss_feed.py @@ -23,7 +23,7 @@ #Python <2.5 has elementtree as 3rd party module from cElementTree import iterparse except ImportError: - print "You need to install cElementTree" + print("You need to install cElementTree") sys.exit(2) @@ -52,7 +52,7 @@ def get_pkg_ver(pv, add_quotes=True): def test_api(pypi_xml): """Basic API tests""" - print "Testing API""" + print("Testing API""") skipped = 0 skipped_msgs = [] failed = 0 @@ -68,29 +68,30 @@ def test_api(pypi_xml): % (pkg_name, "- space in project name")) try: assert versions[0] == ver - print "Testing %s... passed" % elem.text + print("Testing %s... passed" % elem.text) except: failed += 1 failed_msgs.append("%s %s" % (pkg_name, versions)) - print "Testing %s... failed" % elem.text + print("Testing %s... failed" % elem.text) - print "%s tests failed." % failed + print("%s tests failed." % failed) for msg in failed_msgs: - print "\t%s" % msg - print "%s tests skipped." % skipped + print("\t%s" % msg) + print("%s tests skipped." % skipped) for msg in skipped_msgs: - print "\t%s" % msg + print("\t%s" % msg) + def test_cli(pypi_xml): """Test the command-line tool""" - print "Testing CLI" + print("Testing CLI") for event, elem in iterparse(pypi_xml): if elem.tag == "title": if not elem.text.startswith('Cheese Shop recent updates'): - print "Testing %s..." % elem.text + print("Testing %s..." % elem.text) pkg_name, ver = get_pkg_ver(elem.text) if " " in pkg_name: - print "Space in package name, skipping: %s" % pkg_name + print("Space in package name, skipping: %s" % pkg_name) else: os.system("yolk -V '%s'" % pkg_name) os.system("yolk -D %s==%s" % (pkg_name, ver)) diff --git a/yolk/cli.py b/yolk/cli.py index 7ea6a9e..f143850 100755 --- a/yolk/cli.py +++ b/yolk/cli.py @@ -237,9 +237,9 @@ def show_updates(self): """ Check installed packages for available updates on PyPI - @param project_name: optional package name to check; checks every - installed pacakge if none specified - @type project_name: string + self.project_name: optional package name to check; checks every + installed package if none specified + self.project_name: string @returns: None """ @@ -310,7 +310,7 @@ def show_distributions(self, show): for prefix in ignores: if dist.location.startswith(prefix): dist.location = dist.location.replace(prefix, "") - #Case-insensitve search because of Windows + #Case-insensitive search because of Windows if dist.location.lower().startswith(get_python_lib().lower()): develop = "" else: @@ -414,7 +414,7 @@ def show_deps(self): """ Show dependencies for package(s) - @returns: 0 - sucess 1 - No dependency info supplied + @returns: 0 - success 1 - No dependency info supplied """ pkgs = pkg_resources.Environment() @@ -442,7 +442,7 @@ def show_pypi_changelog(self): """ Show detailed PyPI ChangeLog for the last `hours` - @returns: 0 = sucess or 1 if failed to retrieve from XML-RPC server + @returns: 0 = success or 1 if failed to retrieve from XML-RPC server """ hours = self.options.show_pypi_changelog @@ -493,7 +493,7 @@ def show_pypi_releases(self): def show_download_links(self): """ - Query PyPI for pkg download URI for a packge + Query PyPI for pkg download URI for a package @returns: 0 @@ -565,7 +565,7 @@ def fetch(self): if self.options.file_type == "svn": version = "dev" svn_uri = get_download_uri(self.project_name, \ - "dev", True) + "dev", True) if svn_uri: directory = self.project_name + "_svn" return self.fetch_svn(svn_uri, directory) @@ -584,7 +584,7 @@ def fetch(self): return self.fetch_uri(directory, uri) else: self.logger.error("No %s URI found for package: %s " % \ - (self.options.file_type, self.project_name)) + (self.options.file_type, self.project_name)) return 1 def fetch_uri(self, directory, uri): @@ -729,10 +729,10 @@ def versions_available(self): print_pkg_versions(self.project_name, self.all_versions) else: if self.version: - self.logger.error("No pacakge found for version %s" \ + self.logger.error("No package found for version %s" \ % self.version) else: - self.logger.error("No pacakge found for %s" % self.project_name) + self.logger.error("No package found for %s" % self.project_name) return 1 return 0 @@ -788,13 +788,11 @@ def parse_search_spec(self, spec): first = spec (key1, term1) = first.split('=') key1 = key1.strip() + spec = {key1: term1} + if second: (key2, term2) = second.split('=') key2 = key2.strip() - - spec = {} - spec[key1] = term1 - if second: spec[key2] = term2 except: self.logger.error(usage) @@ -807,8 +805,8 @@ def pypi_search(self): Search PyPI by metadata keyword e.g. yolk -S name=yolk AND license=GPL - @param spec: Cheese Shop search spec - @type spec: list of strings + self.pkg_spec: Cheese Shop search spec + self.pkg_spec: list of strings spec examples: ["name=yolk"] @@ -819,7 +817,7 @@ def pypi_search(self): """ spec = self.pkg_spec - #Add remainging cli arguments to options.pypi_search + #Add remaining cli arguments to options.pypi_search search_arg = self.options.pypi_search spec.insert(0, search_arg.strip()) @@ -841,9 +839,6 @@ def show_entry_map(self): """ Show entry map for a package - @param dist: package - @param type: srting - @returns: 0 for success or 1 if error """ pprinter = pprint.PrettyPrinter() diff --git a/yolk/pypi.py b/yolk/pypi.py index 380a819..a93c8e3 100644 --- a/yolk/pypi.py +++ b/yolk/pypi.py @@ -65,7 +65,7 @@ class ProxyTransport(xmlrpclib.Transport): Provides an XMl-RPC transport routing via a http proxy. This is done by using urllib2, which in turn uses the environment - varable http_proxy and whatever else it is built to use (e.g. the + variable http_proxy and whatever else it is built to use (e.g. the windows registry). NOTE: the environment variable http_proxy should be set correctly. @@ -83,7 +83,10 @@ def request(self, host, handler, request_body, verbose): self.verbose = verbose url = 'http://' + host + handler request = urllib2.Request(url) - request.add_data(request_body) + try: + request.add_data(request_body) + except AttributeError: + request.data = request_body # Note: 'Host' and 'Content-Length' are added automatically request.add_header('User-Agent', self.user_agent) request.add_header('Content-Type', 'text/xml') @@ -239,7 +242,7 @@ def release_data(self, package_name, version): try: return self.xmlrpc.release_data(package_name, version) except xmlrpclib.Fault: - #XXX Raises xmlrpclib.Fault if you give non-existant version + #XXX Raises xmlrpclib.Fault if you give non-existent version #Could this be server bug? return @@ -251,7 +254,7 @@ def package_releases(self, package_name): return self.xmlrpc.package_releases(package_name) def get_download_urls(self, package_name, version="", pkg_type="all"): - """Query PyPI for pkg download URI for a packge""" + """Query PyPI for pkg download URI for a package""" if version: versions = [version] diff --git a/yolk/utils.py b/yolk/utils.py index cb85fff..f137329 100644 --- a/yolk/utils.py +++ b/yolk/utils.py @@ -5,7 +5,7 @@ utils.py =========== -Misc funcitions +Misc functions --------------- run_command borrowed from Cheesecake - See CREDITS. diff --git a/yolk/yolklib.py b/yolk/yolklib.py index 5a0a695..7453886 100755 --- a/yolk/yolklib.py +++ b/yolk/yolklib.py @@ -1,5 +1,4 @@ - -''' +""" yolklib.py ========== @@ -13,7 +12,7 @@ License : BSD (See COPYING) -''' +""" __docformat__ = 'restructuredtext' @@ -34,7 +33,7 @@ def __init__(self): def query_activated(self, dist): """ Return True if distribution is active - Return Falsee if distribution is non-active + Return False if distribution is non-active @param dist: pkg_resources Distribution object @@ -131,8 +130,8 @@ def case_sensitive_name(self, package_name): """ Return case-sensitive package name given any-case package name - @param project_name: PyPI project name - @type project_name: string + @param package_name: PyPI project name + @type package_name: string """ if len(self.environment[package_name]): From 084009bdc61ea80c7ce1a3ac9f88268ef3de95ff Mon Sep 17 00:00:00 2001 From: Scott Maxwell Date: Mon, 6 Oct 2014 08:21:26 -0700 Subject: [PATCH 14/14] Bump version number since this is a moderately major change --- yolk/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yolk/__init__.py b/yolk/__init__.py index 9c58573..3b302d3 100644 --- a/yolk/__init__.py +++ b/yolk/__init__.py @@ -10,6 +10,6 @@ """ __docformat__ = 'restructuredtext' -__version__ = '0.4.3' +__version__ = '0.5.0'