[Python-modules-commits] [python-gnupg] 05/09: merge patched into master
Elena Grandi
valhalla-guest at moszumanska.debian.org
Sat Jul 22 16:07:09 UTC 2017
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 cee915e6050600499cf14e37b0dda47fee34046d
Merge: d4b6ccb 9124218
Author: Elena Grandi <valhalla-d at trueelena.org>
Date: Sat Jul 22 16:36:28 2017 +0200
merge patched into master
PKG-INFO | 9 +-
README.rst | 760 +++++++++++----------
debian/.git-dpm | 6 +-
.../0002-Default-on-using-gpg1-as-gpgbinary.patch | 10 +-
debian/patches/skip_network_needing_test.patch | 46 +-
gnupg.py | 356 +++++-----
setup.py | 7 +-
test_gnupg.py | 217 +++++-
8 files changed, 831 insertions(+), 580 deletions(-)
diff --cc debian/.git-dpm
index f46416f,0000000..c31c361
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
- 09a1f18cf9864dba35db34744200f7e40b401d6f
- 09a1f18cf9864dba35db34744200f7e40b401d6f
- 53585fde665095b170b0706129af9238b168becf
++9124218d9c57962bda7a8bbb687ab6c306d974d7
++9124218d9c57962bda7a8bbb687ab6c306d974d7
++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 a69d15d,0000000..c49d423
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 09a1f18cf9864dba35db34744200f7e40b401d6f Mon Sep 17 00:00:00 2001
++From 9124218d9c57962bda7a8bbb687ab6c306d974d7 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 2a08d96..1d32a48 100644
++index b7994ad..ca1518f 100644
+--- a/gnupg.py
++++ b/gnupg.py
- @@ -706,7 +706,7 @@ class GPG(object):
++@@ -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 3559e62..806a7bf 100644
++index 7e3bca0..62324bd 100644
+--- a/test_gnupg.py
++++ b/test_gnupg.py
- @@ -24,7 +24,7 @@ ALL_TESTS = True
++@@ -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 fa39055,0000000..2f10871
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,51 @@@
- From 7a72a5cdc56afed312e44dd45ecc17b026469935 Mon Sep 17 00:00:00 2001
++From e3a8d8ffddfeebc2089ef50ff85001622e70b0e7 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(-)
++ gnupg.py | 9 +++++----
++ test_gnupg.py | 1 +
++ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/gnupg.py b/gnupg.py
- index 4515841..2a08d96 100644
++index 57f23bc..b7994ad 100644
+--- a/gnupg.py
++++ b/gnupg.py
- @@ -1066,8 +1066,8 @@ class GPG(object):
- >>> shutil.rmtree("keys")
- >>> gpg = GPG(gnupghome="keys")
++@@ -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('keyserver.ubuntu.com', '92905378')
++- >>> result = gpg.recv_keys('pgp.mit.edu', '92905378')
+- >>> assert result
- + >>> result = gpg.recv_keys('keyserver.ubuntu.com', '92905378') # doctest: +SKIP
+++ >>> result = gpg.recv_keys('pgp.mit.edu', '92905378') # doctest: +SKIP
++ >>> assert result # doctest: +SKIP
+
+ """
+ result = self.result_map['import'](self)
- @@ -1215,11 +1215,11 @@ class GPG(object):
- >>> shutil.rmtree('keys')
- >>> gpg = GPG(gnupghome='keys')
++@@ -1252,8 +1252,9 @@ 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
- >>> 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()
+++ >>> 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 34c48bb..3559e62 100644
++index 1fb7a5c..7e3bca0 100644
+--- a/test_gnupg.py
++++ b/test_gnupg.py
- @@ -694,6 +694,7 @@ class GPGTestCase(unittest.TestCase):
- shutil.rmtree(d)
++@@ -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
More information about the Python-modules-commits
mailing list