From 2860dc7d419a68168ecde5b569fd35960a32c626 Mon Sep 17 00:00:00 2001 From: Paul Nasrat Date: Wed, 4 May 2011 08:44:02 +0100 Subject: Fix whitespace, etc for pep8 compliance Reran tests after changes on 2.4, 2.6, 3.2 all pass. ===================================================== ================== Running pep8 ===================== Searching for pep8 Reading http://pypi.python.org/simple/pep8/ Reading http://github.com/cburroughs/pep8.py/tree/master Reading http://github.com/jcrocholl/pep8 Best match: pep8 0.6.1 Processing pep8-0.6.1-py2.6.egg pep8 0.6.1 is already the active version in easy-install.pth Installing pep8 script to /Users/pnasrat/Development/pip/pip_virtualenv/bin Using /Users/pnasrat/Development/pip/pip_virtualenv/lib/python2.6/site-packages/pep8-0.6.1-py2.6.egg Processing dependencies for pep8 Finished processing dependencies for pep8 ==================== Ended pep8 ===================== ===================================================== --- contrib/get-pip.py | 3 ++- contrib/packager/__init__.py | 3 +++ contrib/packager/template.py | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'contrib') diff --git a/contrib/get-pip.py b/contrib/get-pip.py index 58d90370c..9fd5b3039 100755 --- a/contrib/get-pip.py +++ b/contrib/get-pip.py @@ -1106,6 +1106,7 @@ import zlib import tempfile import shutil + def unpack(sources): temp_dir = tempfile.mkdtemp('-scratchdir', 'unpacker-') for package, content in sources.items(): @@ -1122,7 +1123,7 @@ def unpack(sources): return temp_dir if __name__ == "__main__": - if sys.version_info >= (3,0): + if sys.version_info >= (3, 0): exec("def do_exec(co, loc): exec(co, loc)\n") import pickle sources = sources.encode("ascii") # ensure bytes diff --git a/contrib/packager/__init__.py b/contrib/packager/__init__.py index 580acd204..96068312a 100644 --- a/contrib/packager/__init__.py +++ b/contrib/packager/__init__.py @@ -8,6 +8,7 @@ import base64 import os import fnmatch + def find_toplevel(name): for syspath in sys.path: lib = os.path.join(syspath, name) @@ -18,10 +19,12 @@ def find_toplevel(name): return mod raise LookupError(name) + def pkgname(toplevel, rootpath, path): parts = path.split(os.sep)[len(rootpath.split(os.sep)):] return '.'.join([toplevel] + [os.path.splitext(x)[0] for x in parts]) + def pkg_to_mapping(name): toplevel = find_toplevel(name) if os.path.isfile(toplevel): diff --git a/contrib/packager/template.py b/contrib/packager/template.py index c7f6fdc76..406958936 100644 --- a/contrib/packager/template.py +++ b/contrib/packager/template.py @@ -10,6 +10,7 @@ import zlib import tempfile import shutil + def unpack(sources): temp_dir = tempfile.mkdtemp('-scratchdir', 'unpacker-') for package, content in sources.items(): @@ -25,8 +26,9 @@ def unpack(sources): mod.close() return temp_dir + if __name__ == "__main__": - if sys.version_info >= (3,0): + if sys.version_info >= (3, 0): exec("def do_exec(co, loc): exec(co, loc)\n") import pickle sources = sources.encode("ascii") # ensure bytes -- cgit v1.2.1