[Python-modules-commits] [python-launchpadlib] 05/07: merge patched into master

[Dimitri John Ledkov]

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

xnox pushed a commit to branch master
in repository python-launchpadlib.

commit 13481f57bacec5cc4a30dc4a6cf3ca61683c20c4
Merge: 4d9420b e814892
Author: Dimitri John Ledkov <xnox at ubuntu.com>
Date:   Sat Aug 13 04:12:58 2016 +0100

    merge patched into master

 PKG-INFO                                           | 10 ++++-
 debian/.git-dpm                                    |  6 +--
 ...-sure-query_string-is-str-before-decoding.patch | 27 ++++++++++++++
 .../patches/ignore_pendingdeprecationwarning.patch | 34 -----------------
 debian/patches/no_package_data.patch               |  2 +-
 debian/patches/series                              |  2 +-
 src/launchpadlib.egg-info/PKG-INFO                 | 10 ++++-
 src/launchpadlib.egg-info/requires.txt             |  2 +-
 src/launchpadlib/NEWS.txt                          |  8 ++++
 src/launchpadlib/__init__.py                       |  2 +-
 src/launchpadlib/apps.py                           |  7 +---
 src/launchpadlib/credentials.py                    | 16 +++++++-
 src/launchpadlib/docs/command-line.txt             | 10 +++--
 src/launchpadlib/docs/introduction.txt             | 14 ++++---
 src/launchpadlib/docs/people.txt                   |  4 +-
 src/launchpadlib/launchpad.py                      | 23 +++++++++---
 src/launchpadlib/testing/tests/test_launchpad.py   |  2 +-
 src/launchpadlib/tests/test_http.py                | 43 ++++++++++------------
 18 files changed, 131 insertions(+), 91 deletions(-)

diff --cc debian/.git-dpm
index 651d9bc,0000000..2ab17cd
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
- 143776f8a4505cbf57a6bac3adb915e2f0bb707d
- 143776f8a4505cbf57a6bac3adb915e2f0bb707d
- 8ed2cc710534c26eccf3f1dd2496051a30160960
++e814892c8884fdfc5548e659d5b7ee9ac7d7ea93
++e814892c8884fdfc5548e659d5b7ee9ac7d7ea93
++bc2191500f579eb9f359f0bf1acb2e142ae7d0b7
 +bc2191500f579eb9f359f0bf1acb2e142ae7d0b7
 +python-launchpadlib_1.10.4.orig.tar.gz
 +9981e2d7788db8fe56b6cfef1ef53fafae3190e3
 +57814
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Make-sure-query_string-is-str-before-decoding.patch
index 0000000,0000000..49e5e08
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Make-sure-query_string-is-str-before-decoding.patch
@@@ -1,0 -1,0 +1,27 @@@
++From e814892c8884fdfc5548e659d5b7ee9ac7d7ea93 Mon Sep 17 00:00:00 2001
++From: Dimitri John Ledkov <xnox at ubuntu.com>
++Date: Sat, 13 Aug 2016 04:12:42 +0100
++Subject: Make sure query_string is str, before decoding.
++
++Origin: commit, revision id: xnox at ubuntu.com-20160813025000-y92qzzkalwf92n9c
++Author: Dimitri John Ledkov <xnox at ubuntu.com>
++Bug: https://launchpad.net/bugs/1471927
++Last-Update: 2016-08-13
++X-Bzr-Revision-Id: xnox at ubuntu.com-20160813025000-y92qzzkalwf92n9c
++---
++ src/launchpadlib/credentials.py | 2 ++
++ 1 file changed, 2 insertions(+)
++
++diff --git a/src/launchpadlib/credentials.py b/src/launchpadlib/credentials.py
++index c0ab813..bb4f74a 100644
++--- a/src/launchpadlib/credentials.py
+++++ b/src/launchpadlib/credentials.py
++@@ -248,6 +248,8 @@ class AccessToken(_AccessToken):
++     @classmethod
++     def from_string(cls, query_string):
++         """Create and return a new `AccessToken` from the given string."""
+++        if not isinstance(query_string, str):
+++            query_string = query_string.decode('utf-8')
++         params = cgi.parse_qs(query_string, keep_blank_values=False)
++         key = params['oauth_token']
++         assert len(key) == 1, (
diff --cc debian/patches/no_package_data.patch
index 9851922,0000000..c5cc54c
mode 100644,000000..100644
--- a/debian/patches/no_package_data.patch
+++ b/debian/patches/no_package_data.patch
@@@ -1,26 -1,0 +1,26 @@@
- From 79aa928b653f4def8e0106dada92d3e0babccf47 Mon Sep 17 00:00:00 2001
++From 6af0482097cad8066d9d7932a213eb37a1b820c1 Mon Sep 17 00:00:00 2001
 +From: Luca Falavigna <dktrkranz at debian.org>
 +Date: Thu, 8 Oct 2015 12:22:11 -0700
 +Subject: Do not install documentation files in Python module directory
 +
 +Bug-Debian: http://bugs.debian.org/580324
 +Forwarded: not-needed
 +
 +Patch-Name: no_package_data.patch
 +---
 + setup.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/setup.py b/setup.py
 +index a1ff3f9..bdfa18e 100755
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -56,7 +56,7 @@ setup(
 +     version=__version__,
 +     packages=find_packages('src'),
 +     package_dir={'':'src'},
 +-    include_package_data=True,
 ++    include_package_data=False,
 +     zip_safe=False,
 +     author='The Launchpad developers',
 +     author_email='launchpadlib at lists.launchpad.net',
diff --cc debian/patches/series
index 5712aa0,0000000..e6a7bf5
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,2 @@@
 +no_package_data.patch
- ignore_pendingdeprecationwarning.patch
++0002-Make-sure-query_string-is-str-before-decoding.patch

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