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

[Elena Grandi]

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

valhalla-guest pushed a commit to branch master
in repository python-gnupg.

commit 3301d1365fba42e58e05bb53aefaa92477d09ff0
Merge: 4a82de6 d19d3f4
Author: Elena Grandi <valhalla-d at trueelena.org>
Date:   Tue Oct 13 10:27:51 2015 +0200

    merge patched into master

 PKG-INFO                                           |   6 +-
 README.rst                                         |  51 +++++++++-
 debian/.git-dpm                                    |   6 +-
 debian/patches/series                              |   1 -
 ...kip_failing_test_because_of_missing_files.patch |  24 -----
 debian/patches/skip_network_needing_test.patch     |  12 +--
 gnupg.py                                           | 105 ++++++++++++++++-----
 setup.py                                           |   2 +
 test_gnupg.py                                      |  53 ++++++++++-
 test_pubring.gpg                                   | Bin 0 -> 4399 bytes
 test_secring.gpg                                   | Bin 0 -> 6724 bytes
 11 files changed, 200 insertions(+), 60 deletions(-)

diff --cc debian/.git-dpm
index d1f3630,0000000..1a524ef
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
- df5704caab0752e8339501f72ef74c77787e8814
- df5704caab0752e8339501f72ef74c77787e8814
- d0c3d08407822e1c069b191a42a15638c06c7be3
++d19d3f404e9d384d54b563ba52edcdd47fce66fb
++d19d3f404e9d384d54b563ba52edcdd47fce66fb
++16065427a552e386da63551fe79e7836133dfac5
 +16065427a552e386da63551fe79e7836133dfac5
 +python-gnupg_0.3.8.orig.tar.gz
 +b3be79566210942a2afcd87ab8f9537749df55c3
 +38993
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/series
index 46e1bee,0000000..581836d
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +skip_network_needing_test.patch
- skip_failing_test_because_of_missing_files.patch
diff --cc debian/patches/skip_network_needing_test.patch
index 76fc2d4,0000000..a15a71f
mode 100644,000000..100644
--- a/debian/patches/skip_network_needing_test.patch
+++ b/debian/patches/skip_network_needing_test.patch
@@@ -1,55 -1,0 +1,55 @@@
- From 49557c98b0118a4f8dfafd37a322fe4f22d28b22 Mon Sep 17 00:00:00 2001
++From d19d3f404e9d384d54b563ba52edcdd47fce66fb Mon Sep 17 00:00:00 2001
 +From: Elena Grandi <elena.valhalla at gmail.com>
 +Date: Thu, 8 Oct 2015 12:11:21 -0700
 +Subject: Skip tests that require internet access
 +
 +Forwarded: not-needed
 +Patch-Name: skip_network_needing_test.patch
 +---
 + gnupg.py      | 12 ++++++------
 + test_gnupg.py |  1 +
 + 2 files changed, 7 insertions(+), 6 deletions(-)
 +
 +diff --git a/gnupg.py b/gnupg.py
- index 353f234..72e51ec 100644
++index cfc6cb9..ec70661 100644
 +--- a/gnupg.py
 ++++ b/gnupg.py
- @@ -984,8 +984,8 @@ class GPG(object):
++@@ -1044,8 +1044,8 @@ class GPG(object):
 +         >>> shutil.rmtree("keys")
 +         >>> gpg = GPG(gnupghome="keys")
 +         >>> os.chmod('keys', 0x1C0)
 +-        >>> result = gpg.recv_keys('keyserver.ubuntu.com', '92905378')
 +-        >>> assert result
 ++        >>> result = gpg.recv_keys('keyserver.ubuntu.com', '92905378')  # doctest: +SKIP
 ++        >>> assert result  # doctest: +SKIP
 + 
 +         """
 +         result = self.result_map['import'](self)
- @@ -1121,11 +1121,11 @@ class GPG(object):
++@@ -1186,11 +1186,11 @@ class GPG(object):
 +         >>> shutil.rmtree('keys')
 +         >>> gpg = GPG(gnupghome='keys')
 +         >>> os.chmod('keys', 0x1C0)
 +-        >>> result = gpg.search_keys('<vinay_sajip at hotmail.com>')
 +-        >>> assert result, 'Failed using default keyserver'
 ++        >>> result = gpg.search_keys('<vinay_sajip at hotmail.com>')  # doctest: +SKIP
 ++        >>> assert result, 'Failed using default keyserver'  # doctest: +SKIP
 +         >>> keyserver = 'keyserver.ubuntu.com'
 +-        >>> result = gpg.search_keys('<vinay_sajip at hotmail.com>', keyserver)
 +-        >>> assert result, 'Failed using keyserver.ubuntu.com'
 ++        >>> result = gpg.search_keys('<vinay_sajip at hotmail.com>', keyserver)  # doctest: +SKIP
 ++        >>> assert result, 'Failed using keyserver.ubuntu.com'  # doctest: +SKIP
 + 
 +         """
 +         query = query.strip()
 +diff --git a/test_gnupg.py b/test_gnupg.py
- index 2a33d08..54e5923 100644
++index f7133b6..f6325ef 100644
 +--- a/test_gnupg.py
 ++++ b/test_gnupg.py
- @@ -547,6 +547,7 @@ class GPGTestCase(unittest.TestCase):
++@@ -597,6 +597,7 @@ class GPGTestCase(unittest.TestCase):
 +             shutil.rmtree(d)
 +         logger.debug("test_filename_with_spaces ends")
 + 
 ++    @unittest.skip('requires network')
 +     def test_search_keys(self):
 +         "Test that searching for keys works"
 +         r = self.gpg.search_keys('<vinay_sajip at hotmail.com>')

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