[Python-modules-commits] [python-pex] 04/05: merge patched into master

[Barry Warsaw]

This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch master
in repository python-pex.

commit cbeb4a6b64d05db075947c51dbaef66cbe1eda29
Merge: 49fecca 4d3749d
Author: Barry Warsaw <barry at debian.org>
Date:   Thu Aug 13 17:07:46 2015 -0400

    merge patched into master

 CHANGES.rst                                        | 31 ++++++++++++++++++++
 PKG-INFO                                           | 33 +++++++++++++++++++++-
 debian/.git-dpm                                    |  6 ++--
 .../handle-pkg_resources-devendorization.patch     |  2 +-
 pex.egg-info/PKG-INFO                              | 33 +++++++++++++++++++++-
 pex/finders.py                                     | 14 +++++++--
 pex/interpreter.py                                 |  5 +++-
 pex/pex.py                                         | 12 +++-----
 pex/pex_info.py                                    | 22 ++++++++-------
 pex/variables.py                                   | 19 ++++++++++---
 pex/version.py                                     |  2 +-
 scripts/coverage.sh                                |  2 +-
 tests/test_pex.py                                  | 16 +++++++++--
 tests/test_pex_info.py                             | 31 ++++++++++++++++++++
 tests/test_variables.py                            | 17 +++++++++++
 tox.ini                                            |  4 +--
 16 files changed, 211 insertions(+), 38 deletions(-)

diff --cc debian/.git-dpm
index 12a7e20,0000000..13a7f55
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 03c984b2b1ad2bbac4788e7f5c012123d29b21ee
- 03c984b2b1ad2bbac4788e7f5c012123d29b21ee
- 7ccc33838db1d5fcf9e16fb478a1be8f44a04fa3
++4d3749d349d7fb866be83614c2dd01b8ee1401ea
++4d3749d349d7fb866be83614c2dd01b8ee1401ea
++5053627b97fcec5fe41e5714cb6b21529b46d5dd
 +5053627b97fcec5fe41e5714cb6b21529b46d5dd
 +python-pex_1.0.3.orig.tar.gz
 +7a8182da2bc74b8a06a0a00289244fda6586daf6
 +106905
diff --cc debian/patches/handle-pkg_resources-devendorization.patch
index d1d1bfc,0000000..8f895b4
mode 100644,000000..100644
--- a/debian/patches/handle-pkg_resources-devendorization.patch
+++ b/debian/patches/handle-pkg_resources-devendorization.patch
@@@ -1,37 -1,0 +1,37 @@@
- From 03c984b2b1ad2bbac4788e7f5c012123d29b21ee Mon Sep 17 00:00:00 2001
++From 4d3749d349d7fb866be83614c2dd01b8ee1401ea Mon Sep 17 00:00:00 2001
 +From: Barry Warsaw <barry at ubuntu.com>
 +Date: Wed, 25 Mar 2015 10:48:51 -0400
 +Subject: Work around Debian's devendorizing of pkg_resource dependencies.
 +
 +Forwarded: not-needed
 +
 +Patch-Name: handle-pkg_resources-devendorization.patch
 +---
 + pex/pex_bootstrapper.py | 14 ++++++++++++++
 + 1 file changed, 14 insertions(+)
 +
 +diff --git a/pex/pex_bootstrapper.py b/pex/pex_bootstrapper.py
 +index 586c788..401b2a7 100644
 +--- a/pex/pex_bootstrapper.py
 ++++ b/pex/pex_bootstrapper.py
 +@@ -95,6 +95,20 @@ def bootstrap_pex(entry_point):
 +   register_finders()
 +   maybe_reexec_pex()
 + 
 ++  # 2015-03-24 BAW (Debian/Ubuntu): This will make grown Pythonistas weep.  In
 ++  # Debian, we devendorize pkg_resources by removing all its bundled
 ++  # dependencies and making it use the system versions.  This plays havoc with
 ++  # pex though, because pex messes with sys.path and sys.modules and ends up
 ++  # double importing sub-modules from pkg_resources.  This confuses Python
 ++  # deeply, resulting in AttributeError tracebacks when pkg_resources itself
 ++  # tries to dig sub-modules out of its own namespace.  Yes, AttributeErrors,
 ++  # not ImportErrors.  By pure trial and error, this seems to work around the
 ++  # problem.
 ++  import sys
 ++  for modname in list(sys.modules):
 ++    if modname.startswith('pkg_resources.'):
 ++      del sys.modules[modname]
 ++
 +   from . import pex
 +   pex.PEX(entry_point).execute()
 + 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-pex.git