[Python-modules-commits] [python-pyramid] 02/03: 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-pyramid.

commit 9cf076b99cb770a5193f323285d72e878c70536b
Merge: 0e7dbd1 c7bd38b
Author: Barry Warsaw <barry at python.org>
Date:   Fri Oct 30 11:14:08 2015 -0400

    merge patched into master

 debian/.git-dpm                               |  4 +--
 debian/patches/getargspec-is-deprecated.patch | 50 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 pyramid/compat.py                             |  5 +++
 pyramid/config/util.py                        |  3 +-
 5 files changed, 60 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 38d83b7,0000000..d0f2afa
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
- 5207dc6e5001215d7c1963b9df52e4450b652b6c
- 5207dc6e5001215d7c1963b9df52e4450b652b6c
++c7bd38b865aee709dfa4410a420a61a97c3bf763
++c7bd38b865aee709dfa4410a420a61a97c3bf763
 +e356bfbd4749ea0bc4c5bb1af9b2ca1dfc4e06aa
 +e356bfbd4749ea0bc4c5bb1af9b2ca1dfc4e06aa
 +python-pyramid_1.5.7+dfsg.orig.tar.gz
 +2ad5e5a68a8ea6dfec47c1b583b5c0bbd27e530b
 +612672
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/getargspec-is-deprecated.patch
index 0000000,0000000..34ee20d
new file mode 100644
--- /dev/null
+++ b/debian/patches/getargspec-is-deprecated.patch
@@@ -1,0 -1,0 +1,50 @@@
++From c7bd38b865aee709dfa4410a420a61a97c3bf763 Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Fri, 30 Oct 2015 11:13:12 -0400
++Subject: =?UTF-8?q?Port=20from=20upstream=20git,=20the=20workaround=20for?=
++ =?UTF-8?q?=20inspect.getargspec()=20being=0Adeprecated=20in=20Python=203.?=
++ =?UTF-8?q?5.?=
++
++Patch-Name: getargspec-is-deprecated.patch
++---
++ pyramid/compat.py      | 5 +++++
++ pyramid/config/util.py | 3 ++-
++ 2 files changed, 7 insertions(+), 1 deletion(-)
++
++diff --git a/pyramid/compat.py b/pyramid/compat.py
++index bfa345b..e2b5bb5 100644
++--- a/pyramid/compat.py
+++++ b/pyramid/compat.py
++@@ -211,6 +211,11 @@ try: # pragma: no cover
++ except NameError: # pragma: no cover
++     input_ = input
++ 
+++if PY3:
+++    from inspect import getfullargspec as getargspec
+++else:
+++    from inspect import getargspec
+++
++ 
++ try: 
++     from StringIO import StringIO as NativeIO
++diff --git a/pyramid/config/util.py b/pyramid/config/util.py
++index 8925921..23cdc6b 100644
++--- a/pyramid/config/util.py
+++++ b/pyramid/config/util.py
++@@ -3,6 +3,7 @@ import inspect
++ 
++ from pyramid.compat import (
++     bytes_,
+++    getargspec,
++     is_nonstr_iter,
++     )
++ 
++@@ -201,7 +202,7 @@ def takes_one_arg(callee, attr=None, argname=None):
++             return False
++ 
++     try:
++-        argspec = inspect.getargspec(fn)
+++        argspec = getargspec(fn)
++     except TypeError:
++         return False
++ 
diff --cc debian/patches/series
index da632fa,0000000..8b869a6
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +tweak-requirements.patch
++getargspec-is-deprecated.patch

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