commit: a7eaa1b544a975c1ce68f86e060fe675f683ad18
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 04:26:01 2016 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 04:27:44 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7eaa1b5
dev-python/dugong: remove old
dev-python/dugong/Manifest | 2 -
dev-python/dugong/dugong-3.4.ebuild | 30 ------
dev-python/dugong/dugong-3.5.ebuild | 30 ------
dev-python/dugong/files/3.2-aborted_write.patch | 45 ---------
dev-python/dugong/files/3.2-extract_links.patch | 26 -----
dev-python/dugong/files/3.2-timeout.patch | 19 ----
dev-python/dugong/files/3.3-test-timeout.patch | 128 ------------------------
7 files changed, 280 deletions(-)
diff --git a/dev-python/dugong/Manifest b/dev-python/dugong/Manifest
index 998c7a8..fe35b20 100644
--- a/dev-python/dugong/Manifest
+++ b/dev-python/dugong/Manifest
@@ -1,3 +1 @@
-DIST dugong-3.4.tar.bz2 190012 SHA256
148a65931b52e030f8eb5e1dd2740eb62754ad0c831d15c22f923f7f8274ad33 SHA512
67cf314629298249bfe0305ce2d79f66b71d6415090fab9721e62c38549863098b3048f2936532073dfe52438cf638fbc4ce46cbdbae14b7dd5158e8d9a1cdbb
WHIRLPOOL
b8be0bb5f7475f85ae219199a993362759646a9972934be14372b16455b18f1f2f33f4bdb553ef762e887673dc198ac6f07d863fe715a70721f2e4763752b9af
-DIST dugong-3.5.tar.bz2 192228 SHA256
44bc81cd25b2e8762458b59f2f2382a3e59869c457edbbcdfe03541e576f1978 SHA512
204d8fceb63e9036f026e5a23da028a41600a740ceaa42f54474a1986c19cb224ca335d81c24c257dd761ac0f58443091df1d95fb0e1776eb3227c18d5331e39
WHIRLPOOL
678525106190b82c0be3d2c0ab72d006a8bd1b4343071bfa8d9702a7d8619859406f39a59a6bd87160d9ca31bf026cb547a55bc75907f645eba2da24ab77c1e3
DIST dugong-3.7.tar.bz2 193975 SHA256
68f7810742e1c54a5cddfa49992d416704c13b25263bd3278f7581cbc2adb2e1 SHA512
f6e637946ec5f402a21dc40f08ab187bed281b4b7c27c056651eac049d9aaf4c952bfa5e19c05db6cac2d284cf7dbd47250b82cdbcac998971fd10466a47fe21
WHIRLPOOL
3ee51fc0f085f94f64d04b6ef04fb69db8f4a569347eee4fbb1e18727343752dbf6b7df080776ca38b87f49d8495b5bd6361eb25f3cd12b4bc54b911be96a87c
diff --git a/dev-python/dugong/dugong-3.4.ebuild
b/dev-python/dugong/dugong-3.4.ebuild
deleted file mode 100644
index 873b143..00000000
--- a/dev-python/dugong/dugong-3.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python3_{3,4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for communicating with HTTP 1.1 servers"
-HOMEPAGE="https://bitbucket.org/nikratio/python-dugong/";
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
- py.test -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/html/. )
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/dugong/dugong-3.5.ebuild
b/dev-python/dugong/dugong-3.5.ebuild
deleted file mode 100644
index 71cc545..00000000
--- a/dev-python/dugong/dugong-3.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python3_{3,4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for communicating with HTTP 1.1 servers"
-HOMEPAGE="https://bitbucket.org/nikratio/python-dugong/";
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
- py.test -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/html/. )
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/dugong/files/3.2-aborted_write.patch
b/dev-python/dugong/files/3.2-aborted_write.patch
deleted file mode 100644
index bf25a37..00000000
--- a/dev-python/dugong/files/3.2-aborted_write.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://bitbucket.org/nikratio/python-dugong/issue/13/test_aborted_write-failures-in-latest
-diff --git a/test/test_dugong.py b/test/test_dugong.py
---- a/test/test_dugong.py
-+++ b/test/test_dugong.py
-@@ -540,7 +540,7 @@
- conn.readall()
-
- def test_aborted_write1(conn, monkeypatch):
-- BUFSIZE = 64*1024
-+ BUFSIZE = 640*1024
-
- # Monkeypatch request handler
- def do_PUT(self):
-@@ -561,8 +561,9 @@
-
- # Try to write data
- with pytest.raises(ConnectionClosed):
-- for _ in range(50):
-+ for _ in range(5000):
- conn.write(b'f' * BUFSIZE)
-+ time.sleep(0.1)
-
- # Nevertheless, try to read response
- resp = conn.read_response()
-@@ -570,7 +571,7 @@
- assert resp.reason == 'Please stop!'
-
- def test_aborted_write2(conn, monkeypatch):
-- BUFSIZE = 64*1024
-+ BUFSIZE = 640*1024
-
- # Monkeypatch request handler
- def do_PUT(self):
-@@ -589,8 +590,9 @@
-
- # Try to write data
- with pytest.raises(ConnectionClosed):
-- for _ in range(50):
-+ for _ in range(5000):
- conn.write(b'f' * BUFSIZE)
-+ time.sleep(0.1)
-
- # Nevertheless, try to read response
- assert_raises(ConnectionClosed, conn.read_response)
-
diff --git a/dev-python/dugong/files/3.2-extract_links.patch
b/dev-python/dugong/files/3.2-extract_links.patch
deleted file mode 100644
index 0e8d251..00000000
--- a/dev-python/dugong/files/3.2-extract_links.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# HG changeset patch
-# User Nikolaus Rath <[email protected]>
-# Date 1407732767 25200
-# Node ID 1cfd473db8736251291e106ce6cd488011626276
-# Parent cd7ad81f4eea24e530db152edd6d8831dc5bd7bc
-Make extract_links.py Python 3.3 compatible again.
-
-Fixes issue #15.
-
-diff --git a/examples/extract_links.py b/examples/extract_links.py
---- a/examples/extract_links.py
-+++ b/examples/extract_links.py
-@@ -30,7 +30,11 @@
-
- class LinkExtractor(HTMLParser):
- def __init__(self):
-- super().__init__(convert_charrefs=True)
-+ if sys.version_info < (3,4):
-+ # Python 3.3 doesn't know about convert_charrefs
-+ super().__init__()
-+ else:
-+ super().__init__(convert_charrefs=True)
- self.links = []
-
- def handle_starttag(self, tag, attrs):
-
diff --git a/dev-python/dugong/files/3.2-timeout.patch
b/dev-python/dugong/files/3.2-timeout.patch
deleted file mode 100644
index 5ee43f7..00000000
--- a/dev-python/dugong/files/3.2-timeout.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bitbucket.org/nikratio/python-dugong/issue/14/test_send_timeout-ssl-failure-in-latest
-diff --git a/test/test_dugong.py b/test/test_dugong.py
---- a/test/test_dugong.py
-+++ b/test/test_dugong.py
-@@ -726,11 +728,11 @@
-
- # We don't know how much data can be buffered, so we
- # claim to send a lot and do so in a loop.
-- len_ = 1024**3
-+ len_ = 10 * 1024**3
- conn.send_request('PUT', '/recv_something', body=BodyFollowing(len_))
- with pytest.raises(dugong.ConnectionTimedOut):
- while len_ > 0:
-- conn.write(b'x' * min(len_, 16*1024))
-+ conn.write(b'x' * min(len_, 640*1024))
-
-
- DUMMY_DATA = ','.join(str(x) for x in range(10000)).encode()
-
diff --git a/dev-python/dugong/files/3.3-test-timeout.patch
b/dev-python/dugong/files/3.3-test-timeout.patch
deleted file mode 100644
index afd3912..00000000
--- a/dev-python/dugong/files/3.3-test-timeout.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-https://bitbucket.org/nikratio/python-dugong/commits/0e9d67700bc8
-diff --git a/test/test_dugong.py b/test/test_dugong.py
---- a/test/test_dugong.py
-+++ b/test/test_dugong.py
-@@ -99,6 +99,12 @@
- request.addfinalizer(conn.disconnect)
- return conn
-
[email protected]()
-+def random_fh(request):
-+ fh = open('/dev/urandom', 'rb')
-+ request.addfinalizer(fh.close)
-+ return fh
-+
- def check_http_connection():
- '''Skip test if we can't connect to ssl test server'''
-
-@@ -170,12 +176,12 @@
- conn.get_ssl_cipher()
- conn.get_ssl_peercert()
-
--def test_blocking_send(conn):
-+def test_blocking_send(conn, random_fh):
- # Send requests until we block because all TCP buffers are full
-
-- path = '/send_100_1200-byte_chunks'
-+ path = '/send_102400_random_bytes'
- for count in itertools.count():
-- crt = conn.co_send_request('GET', path, body=DUMMY_DATA[:8192])
-+ crt = conn.co_send_request('GET', path, body=random_fh.read(8192))
- flag = False
- for io_req in crt:
- if not io_req.poll(1):
-@@ -539,7 +545,7 @@
- conn.read_response()
- conn.readall()
-
--def test_aborted_write1(conn, monkeypatch):
-+def test_aborted_write1(conn, monkeypatch, random_fh):
- BUFSIZE = 64*1024
-
- # Monkeypatch request handler
-@@ -562,14 +568,14 @@
- # Try to write data
- with pytest.raises(ConnectionClosed):
- for _ in range(50):
-- conn.write(b'f' * BUFSIZE)
-+ conn.write(random_fh.read(BUFSIZE))
-
- # Nevertheless, try to read response
- resp = conn.read_response()
- assert resp.status == 401
- assert resp.reason == 'Please stop!'
-
--def test_aborted_write2(conn, monkeypatch):
-+def test_aborted_write2(conn, monkeypatch, random_fh):
- BUFSIZE = 64*1024
-
- # Monkeypatch request handler
-@@ -590,7 +596,7 @@
- # Try to write data
- with pytest.raises(ConnectionClosed):
- for _ in range(50):
-- conn.write(b'f' * BUFSIZE)
-+ conn.write(random_fh.read(BUFSIZE))
-
- # Nevertheless, try to read response
- assert_raises(ConnectionClosed, conn.read_response)
-@@ -716,12 +722,13 @@
- assert conn.read(50) == b'x' * 25
- assert_raises(dugong.ConnectionTimedOut, conn.read, 50)
-
--def test_send_timeout(conn, monkeypatch):
-+def test_send_timeout(conn, monkeypatch, random_fh):
- conn.timeout = 1
-
- def do_PUT(self):
- # Read just a tiny bit
- self.rfile.read(256)
-+ time.sleep(2*conn.timeout)
- monkeypatch.setattr(MockRequestHandler, 'do_PUT', do_PUT)
-
- # We don't know how much data can be buffered, so we
-@@ -730,7 +737,7 @@
- conn.send_request('PUT', '/recv_something', body=BodyFollowing(len_))
- with pytest.raises(dugong.ConnectionTimedOut):
- while len_ > 0:
-- conn.write(b'x' * min(len_, 16*1024))
-+ conn.write(random_fh.read(min(len_, 16*1024)))
-
-
- DUMMY_DATA = ','.join(str(x) for x in range(10000)).encode()
-@@ -743,6 +750,14 @@
- def log_message(self, format, *args):
- pass
-
-+ def setup(self):
-+ super().setup()
-+ self.random_fh = open('/dev/urandom', 'rb')
-+
-+ def finish(self):
-+ super().finish()
-+ self.random_fh.close()
-+
- def handle_expect_100(self):
- if self.handle_errors():
- return
-@@ -782,14 +797,17 @@
- self.wfile.close()
- return
-
-- hit = re.match(r'^/send_([0-9]+)_bytes', self.path)
-+ hit = re.match(r'^/send_([0-9]+)_(random_)?bytes', self.path)
- if hit:
- len_ = int(hit.group(1))
- self.send_response(200)
- self.send_header("Content-Type", 'application/octet-stream')
- self.send_header("Content-Length", str(len_))
- self.end_headers()
-- self.wfile.write(DUMMY_DATA[:len_])
-+ if hit.group(2):
-+ self.wfile.write(self.random_fh.read(len_))
-+ else:
-+ self.wfile.write(DUMMY_DATA[:len_])
- return
-
- hit =
re.match(r'^/send_([0-9]+)_([0-9]+)-byte_chunks(?:_delay_([0-9]+)_ms)?',
-
