summaryrefslogtreecommitdiff
path: root/dev-python/python-gnupg/files
diff options
context:
space:
mode:
authorConrad Kostecki <conikost@gentoo.org>2019-12-20 20:40:39 +0100
committerConrad Kostecki <conikost@gentoo.org>2019-12-20 20:42:54 +0100
commit96b5608ee3d86f4710dbca58e1c702bf18b90eaf (patch)
tree00eeff7bb40bc52184612e706a21716185f16420 /dev-python/python-gnupg/files
parent1e62b3ed1ff096044555f0b519096d589b395aa1 (diff)
downloadgentoo-96b5608ee3d86f4710dbca58e1c702bf18b90eaf.tar.gz
gentoo-96b5608ee3d86f4710dbca58e1c702bf18b90eaf.tar.bz2
gentoo-96b5608ee3d86f4710dbca58e1c702bf18b90eaf.zip
dev-python/python-gnupg: drop old versions
Bug: https://bugs.gentoo.org/685864 Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'dev-python/python-gnupg/files')
-rw-r--r--dev-python/python-gnupg/files/python-gnupg-0.4.3-skip_network_needing_test.patch51
-rw-r--r--dev-python/python-gnupg/files/python-gnupg-0.4.3-use_seperate_keys_directory.patch50
2 files changed, 0 insertions, 101 deletions
diff --git a/dev-python/python-gnupg/files/python-gnupg-0.4.3-skip_network_needing_test.patch b/dev-python/python-gnupg/files/python-gnupg-0.4.3-skip_network_needing_test.patch
deleted file mode 100644
index f6df14348c1a..000000000000
--- a/dev-python/python-gnupg/files/python-gnupg-0.4.3-skip_network_needing_test.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-# HG changeset patch
-# User Vinay Sajip <vinay_sajip@yahoo.co.uk>
-# Date 1528916733 -3600
-# Node ID f16d4e17cf349cf9ee561e117262a4041e4fe2ee
-# Parent 60ece27e564ef381392dc19a544aa289fb598c7e
-Conditionally skip tests that rely on flaky external servers/networks.
-
-diff --git a/gnupg.py b/gnupg.py
---- a/gnupg.py
-+++ b/gnupg.py
-@@ -1118,7 +1118,7 @@
- >>> gpg = GPG(gpgbinary=GPGBINARY, gnupghome="keys")
- >>> os.chmod('keys', 0x1C0)
- >>> result = gpg.recv_keys('pgp.mit.edu', '92905378')
-- >>> assert result
-+ >>> if 'NO_EXTERNAL_TESTS' not in os.environ: assert result
-
- """
- result = self.result_map['import'](self)
-@@ -1321,7 +1321,7 @@
- >>> gpg = GPG(gpgbinary=GPGBINARY, gnupghome='keys')
- >>> os.chmod('keys', 0x1C0)
- >>> result = gpg.search_keys('<vinay_sajip@hotmail.com>')
-- >>> assert result, 'Failed using default keyserver'
-+ >>> if 'NO_EXTERNAL_TESTS' not in os.environ: assert result, 'Failed using default keyserver'
- >>> #keyserver = 'keyserver.ubuntu.com'
- >>> #result = gpg.search_keys('<vinay_sajip@hotmail.com>', keyserver)
- >>> #assert result, 'Failed using keyserver.ubuntu.com'
-diff --git a/test_gnupg.py b/test_gnupg.py
---- a/test_gnupg.py
-+++ b/test_gnupg.py
-@@ -836,12 +836,13 @@
- #@skipIf(os.name == 'nt', 'Test not suitable for Windows')
- def test_search_keys(self):
- "Test that searching for keys works"
-- r = self.gpg.search_keys('<vinay_sajip@hotmail.com>')
-- self.assertTrue(r)
-- self.assertTrue('Vinay Sajip <vinay_sajip@hotmail.com>' in r[0]['uids'])
-- r = self.gpg.search_keys('92905378')
-- self.assertTrue(r)
-- self.assertTrue('Vinay Sajip <vinay_sajip@hotmail.com>' in r[0]['uids'])
-+ if 'NO_EXTERNAL_TESTS' not in os.environ:
-+ r = self.gpg.search_keys('<vinay_sajip@hotmail.com>')
-+ self.assertTrue(r)
-+ self.assertTrue('Vinay Sajip <vinay_sajip@hotmail.com>' in r[0]['uids'])
-+ r = self.gpg.search_keys('92905378')
-+ self.assertTrue(r)
-+ self.assertTrue('Vinay Sajip <vinay_sajip@hotmail.com>' in r[0]['uids'])
-
- def test_quote_with_shell(self):
- "Test shell quoting with a real shell"
diff --git a/dev-python/python-gnupg/files/python-gnupg-0.4.3-use_seperate_keys_directory.patch b/dev-python/python-gnupg/files/python-gnupg-0.4.3-use_seperate_keys_directory.patch
deleted file mode 100644
index b57137200990..000000000000
--- a/dev-python/python-gnupg/files/python-gnupg-0.4.3-use_seperate_keys_directory.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-# HG changeset patch
-# User Vinay Sajip <vinay_sajip@yahoo.co.uk>
-# Date 1534104706 -3600
-# Node ID aeb916c839c0f556dae96bb1136be760ccc19cfe
-# Parent 1a5795e58fe216c1227a11d169dbe4c09c625d15
-Fixed problem with a fixed 'keys' homedir on slow/busy systems (see PR #24).
-
-diff --git a/test_gnupg.py b/test_gnupg.py
---- a/test_gnupg.py
-+++ b/test_gnupg.py
-@@ -173,11 +173,14 @@
-
- class GPGTestCase(unittest.TestCase):
- def setUp(self):
-- hd = os.path.join(os.getcwd(), 'keys')
-- if os.path.exists(hd):
-- self.assertTrue(os.path.isdir(hd),
-- "Not a directory: %s" % hd)
-- shutil.rmtree(hd, ignore_errors=True)
-+ if 'STATIC_TEST_HOMEDIR' not in os.environ:
-+ hd = tempfile.mkdtemp(prefix='keys-')
-+ else:
-+ hd = os.path.join(os.getcwd(), 'keys')
-+ if os.path.exists(hd):
-+ self.assertTrue(os.path.isdir(hd),
-+ "Not a directory: %s" % hd)
-+ shutil.rmtree(hd, ignore_errors=True)
- prepare_homedir(hd)
- self.homedir = hd
- self.gpg = gpg = gnupg.GPG(gnupghome=hd, gpgbinary=GPGBINARY)
-@@ -193,6 +196,10 @@
- data_file.write(os.urandom(5120 * 1024))
- data_file.close()
-
-+ def tearDown(self):
-+ if 'STATIC_TEST_HOMEDIR' not in os.environ:
-+ shutil.rmtree(self.homedir, ignore_errors=True)
-+
- def test_environment(self):
- "Test the environment by ensuring that setup worked"
- hd = self.homedir
-@@ -373,7 +380,7 @@
- # and the keyring file name has changed.
- pkn = 'pubring.kbx'
- skn = None
-- hd = os.path.join(os.getcwd(), 'keys')
-+ hd = self.homedir
- if os.name == 'posix':
- pkn = os.path.join(hd, pkn)
- if skn: