[Python-modules-commits] [python-gnupg] 09/09: 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 1a3717f346a5b880a27176a1e0afdb47331dd101
Merge: e5b089c 8da095b
Author: Elena Grandi <valhalla-d at trueelena.org>
Date:   Sat Jul 22 17:10:55 2017 +0200

    merge patched into master

 debian/.git-dpm                                             |  4 ++--
 .../patches/0002-Default-on-using-gpg1-as-gpgbinary.patch   |  4 ++--
 debian/patches/skip_network_needing_test.patch              | 13 ++++++-------
 gnupg.py                                                    |  3 +--
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --cc debian/.git-dpm
index c31c361,0000000..628a186
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
- 9124218d9c57962bda7a8bbb687ab6c306d974d7
- 9124218d9c57962bda7a8bbb687ab6c306d974d7
++8da095b2385196108f0084da3110e4bec363d4a2
++8da095b2385196108f0084da3110e4bec363d4a2
 +c8cae436bd76deb1ca78fb573de1aa043b8a2d09
 +c8cae436bd76deb1ca78fb573de1aa043b8a2d09
 +python-gnupg_0.4.1.orig.tar.gz
 +68e8c28ccc812e8074f62700aa7a895274500644
 +44534
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Default-on-using-gpg1-as-gpgbinary.patch
index c49d423,0000000..0cec9ec
mode 100644,000000..100644
--- a/debian/patches/0002-Default-on-using-gpg1-as-gpgbinary.patch
+++ b/debian/patches/0002-Default-on-using-gpg1-as-gpgbinary.patch
@@@ -1,36 -1,0 +1,36 @@@
- From 9124218d9c57962bda7a8bbb687ab6c306d974d7 Mon Sep 17 00:00:00 2001
++From 8da095b2385196108f0084da3110e4bec363d4a2 Mon Sep 17 00:00:00 2001
 +From: Elena Grandi <valhalla-d at trueelena.org>
 +Date: Wed, 17 Aug 2016 19:39:21 +0200
 +Subject: Default on using gpg1 as gpgbinary
 +
 +---
 + gnupg.py      | 2 +-
 + test_gnupg.py | 2 +-
 + 2 files changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/gnupg.py b/gnupg.py
- index b7994ad..ca1518f 100644
++index 8f4b856..2a8a9c5 100644
 +--- a/gnupg.py
 ++++ b/gnupg.py
 +@@ -709,7 +709,7 @@ class GPG(object):
 +     }
 + 
 +     "Encapsulate access to the gpg executable"
 +-    def __init__(self, gpgbinary='gpg', gnupghome=None, verbose=False,
 ++    def __init__(self, gpgbinary='gpg1', gnupghome=None, verbose=False,
 +                  use_agent=False, keyring=None, options=None,
 +                  secret_keyring=None):
 +         """Initialize a GPG process wrapper.  Options are:
 +diff --git a/test_gnupg.py b/test_gnupg.py
 +index 7e3bca0..62324bd 100644
 +--- a/test_gnupg.py
 ++++ b/test_gnupg.py
 +@@ -34,7 +34,7 @@ ALL_TESTS = True
 + 
 + logger = logging.getLogger(__name__)
 + 
 +-GPGBINARY = os.environ.get('GPGBINARY', 'gpg')
 ++GPGBINARY = os.environ.get('GPGBINARY', 'gpg1')
 + 
 + KEYS_TO_IMPORT = """-----BEGIN PGP PUBLIC KEY BLOCK-----
 + Version: GnuPG v1.4.9 (MingW32)
diff --cc debian/patches/skip_network_needing_test.patch
index 2f10871,0000000..b8e285e
mode 100644,000000..100644
--- a/debian/patches/skip_network_needing_test.patch
+++ b/debian/patches/skip_network_needing_test.patch
@@@ -1,51 -1,0 +1,50 @@@
- From e3a8d8ffddfeebc2089ef50ff85001622e70b0e7 Mon Sep 17 00:00:00 2001
++From e9d26814c64d0bedb5021e37247d07741bb04515 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      | 9 +++++----
++ gnupg.py      | 8 ++++----
 + test_gnupg.py | 1 +
-  2 files changed, 6 insertions(+), 4 deletions(-)
++ 2 files changed, 5 insertions(+), 4 deletions(-)
 +
 +diff --git a/gnupg.py b/gnupg.py
- index 57f23bc..b7994ad 100644
++index 57f23bc..8f4b856 100644
 +--- a/gnupg.py
 ++++ b/gnupg.py
 +@@ -1062,8 +1062,8 @@ class GPG(object):
 +         >>> GPGBINARY = os.environ.get('GPGBINARY', 'gpg')
 +         >>> gpg = GPG(gpgbinary=GPGBINARY, gnupghome="keys")
 +         >>> os.chmod('keys', 0x1C0)
 +-        >>> result = gpg.recv_keys('pgp.mit.edu', '92905378')
 +-        >>> assert result
 ++        >>> result = gpg.recv_keys('pgp.mit.edu', '92905378')  # doctest: +SKIP
 ++        >>> assert result  # doctest: +SKIP
 + 
 +         """
 +         result = self.result_map['import'](self)
- @@ -1252,8 +1252,9 @@ class GPG(object):
++@@ -1252,8 +1252,8 @@ class GPG(object):
 +         >>> GPGBINARY = os.environ.get('GPGBINARY', 'gpg')
 +         >>> gpg = GPG(gpgbinary=GPGBINARY, 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
+++        >>> 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'
 +diff --git a/test_gnupg.py b/test_gnupg.py
 +index 1fb7a5c..7e3bca0 100644
 +--- a/test_gnupg.py
 ++++ b/test_gnupg.py
 +@@ -761,6 +761,7 @@ class GPGTestCase(unittest.TestCase):
 +         logger.debug("test_filename_with_spaces ends")
 + 
 +     #@skipIf(os.name == 'nt', 'Test not suitable for Windows')
 ++    @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