[Python-modules-commits] [python-gnupg] 02/04: 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 011ea0ed9c53d970bff5cf4617837e8835c0e251
Merge: 77295c5 fd6835d
Author: Elena Grandi <valhalla-d at trueelena.org>
Date:   Sun Nov 29 15:04:05 2015 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...002-Correctly-capture-subkey-fingerprints.patch | 63 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 gnupg.py                                           |  7 ++-
 test_gnupg.py                                      |  3 +-
 5 files changed, 73 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 1a524ef,0000000..bb3e22d
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
- d19d3f404e9d384d54b563ba52edcdd47fce66fb
- d19d3f404e9d384d54b563ba52edcdd47fce66fb
++fd6835d8beec6703c412c06d2cca6e8c74d8f417
++fd6835d8beec6703c412c06d2cca6e8c74d8f417
 +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/0002-Correctly-capture-subkey-fingerprints.patch
index 0000000,0000000..55bd542
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Correctly-capture-subkey-fingerprints.patch
@@@ -1,0 -1,0 +1,63 @@@
++From fd6835d8beec6703c412c06d2cca6e8c74d8f417 Mon Sep 17 00:00:00 2001
++From: Elena Grandi <valhalla-d at trueelena.org>
++Date: Sun, 29 Nov 2015 15:03:57 +0100
++Subject: Correctly capture subkey fingerprints.
++
++---
++ gnupg.py      | 7 +++++--
++ test_gnupg.py | 3 ++-
++ 2 files changed, 7 insertions(+), 3 deletions(-)
++
++diff --git a/gnupg.py b/gnupg.py
++index ec70661..01f86ff 100644
++--- a/gnupg.py
+++++ b/gnupg.py
++@@ -455,7 +455,6 @@ class ListKeys(SearchKeys):
++ 
++         crt = X.509 certificate
++         crs = X.509 certificate and private key available
++-        ssb = secret subkey (secondary key)
++         uat = user attribute (same as user id except for field 10).
++         sig = signature
++         rev = revocation signature
++@@ -500,6 +499,10 @@ class ListKeys(SearchKeys):
++         self.curkey['subkeys'].append(subkey)
++         self.in_subkey = True
++ 
+++    def ssb(self, args):
+++        subkey = [args[4], None]    # keyid, type
+++        self.curkey['subkeys'].append(subkey)
+++        self.in_subkey = True
++ 
++ class ScanKeys(ListKeys):
++     ''' Handle status messages for --with-fingerprint.'''
++@@ -1121,7 +1124,7 @@ class GPG(object):
++         self._collect_output(p, result, stdin=p.stdin)
++         lines = result.data.decode(self.encoding,
++                                    self.decode_errors).splitlines()
++-        valid_keywords = 'pub uid sec fpr sub'.split()
+++        valid_keywords = 'pub uid sec fpr sub ssb'.split()
++         for line in lines:
++             if self.verbose:
++                 print(line)
++diff --git a/test_gnupg.py b/test_gnupg.py
++index f6325ef..55a3c8e 100644
++--- a/test_gnupg.py
+++++ b/test_gnupg.py
++@@ -240,6 +240,7 @@ class GPGTestCase(unittest.TestCase):
++         private_keys = self.gpg.list_keys(secret=True)
++         self.assertTrue(is_list_with_len(private_keys, 1),
++                         "1-element list expected")
+++        self.assertEqual(len(private_keys.fingerprints), 1)
++         # Now do the same test, but using keyring and secret_keyring arguments
++         hd = os.path.join(os.getcwd(), 'keys')
++         gpg = gnupg.GPG(gnupghome=hd, gpgbinary=GPGBINARY,
++@@ -689,7 +690,7 @@ def suite(args=None):
++ 
++ def init_logging():
++     logging.basicConfig(level=logging.DEBUG, filename="test_gnupg.log",
++-                        filemode="w", format="%(asctime)s %(levelname)-5s %(name)-10s %(threadName)-10s %(message)s")
+++                        filemode="w", format="%(asctime)s %(levelname)-5s %(name)-10s %(threadName)-10s %(lineno)4d %(message)s")
++ 
++ def main():
++     init_logging()
diff --cc debian/patches/series
index 581836d,0000000..2cf634e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +skip_network_needing_test.patch
++0002-Correctly-capture-subkey-fingerprints.patch

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