[Python-modules-commits] [cherrypy3] 05/06: merge patched into master

[Carl Suster]

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

arcresu-guest pushed a commit to branch master
in repository cherrypy3.

commit 418b433e086d3226d25623b6d6d63f1cb5658ac6
Merge: 74bd610 91a87a3
Author: Carl Suster <carl at contraflo.ws>
Date:   Fri Jan 6 20:30:30 2017 +1100

    merge patched into master

 cherrypy/lib/reprconf.py                           |  5 +++++
 cherrypy/test/static/index.html                    |  2 +-
 cherrypy/tutorial/tutorial.conf                    |  8 ++++----
 debian/.git-dpm                                    |  4 ++--
 .../0004-unrepr-also-from-__builtin__.patch        | 22 +++++++++++++++++-----
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --cc debian/.git-dpm
index 22bb794,0000000..649b10a
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 48edb047d52c3b5622ce80c65e6514505fc30d32
- 48edb047d52c3b5622ce80c65e6514505fc30d32
++91a87a35e9769919192463c5f7b46cb211b5b9e1
++91a87a35e9769919192463c5f7b46cb211b5b9e1
 +19b5509b39bed64544a4d901e6751e90a6da93a7
 +19b5509b39bed64544a4d901e6751e90a6da93a7
 +cherrypy3_8.7.0.orig.tar.gz
 +6a55e351e68edc3ccf1a5d2d99117c400d13ea6f
 +712835
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0004-unrepr-also-from-__builtin__.patch
index 5b93f6c,0000000..9387663
mode 100644,000000..100644
--- a/debian/patches/0004-unrepr-also-from-__builtin__.patch
+++ b/debian/patches/0004-unrepr-also-from-__builtin__.patch
@@@ -1,33 -1,0 +1,45 @@@
- From 48edb047d52c3b5622ce80c65e6514505fc30d32 Mon Sep 17 00:00:00 2001
++From 91a87a35e9769919192463c5f7b46cb211b5b9e1 Mon Sep 17 00:00:00 2001
 +From: Carl Suster <carl at contraflo.ws>
 +Date: Fri, 6 Jan 2017 20:21:51 +1100
 +Subject: unrepr also from __builtin__
 +
 +The Python2 tests are failing because __import__ is not found either as
 +a module or inside the module "builtins". According to the docs at
 +https://docs.python.org/2/library/functions.html#__import__ this
 +function is instead inside the module "__builtin__".
 +
 +This patch makes unrepr also look for the name inside __builtin__ so
 +that it can find __import__. It is not clear why this works upstream but
 +not in Debian.
 +---
-  cherrypy/lib/reprconf.py | 5 +++++
-  1 file changed, 5 insertions(+)
++ cherrypy/lib/reprconf.py | 10 ++++++++++
++ 1 file changed, 10 insertions(+)
 +
 +diff --git a/cherrypy/lib/reprconf.py b/cherrypy/lib/reprconf.py
- index 2553292..0d9f7b8 100644
++index 2553292..0e380b5 100644
 +--- a/cherrypy/lib/reprconf.py
 ++++ b/cherrypy/lib/reprconf.py
- @@ -465,6 +465,11 @@ class _Builder3:
++@@ -321,6 +321,11 @@ class _Builder2:
++             return getattr(builtins, name)
++         except AttributeError:
++             pass
+++        try:
+++            import __builtin__
+++            return getattr(__builtin__, name)
+++        except AttributeError:
+++            pass
++ 
++         raise TypeError('unrepr could not resolve the name %s' % repr(name))
++ 
++@@ -465,6 +470,11 @@ class _Builder3:
 +             return getattr(builtins, name)
 +         except AttributeError:
 +             pass
 ++        try:
 ++            import __builtin__
 ++            return getattr(__builtin__, name)
 ++        except AttributeError:
 ++            pass
 + 
 +         raise TypeError('unrepr could not resolve the name %s' % repr(name))
 + 

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