summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2017-05-02 18:58:54 +0200
committerMichał Górny <mgorny@gentoo.org>2017-05-02 19:43:16 +0200
commit8cf290c49e9435122e2d55666d5b9aba00c95f18 (patch)
tree577e43bf2a352ed8a8cbf53ba0e77463fd1c59dc
parentdev-python/freezegun: Clean old versions up (diff)
downloadgentoo-8cf290c49e9435122e2d55666d5b9aba00c95f18.tar.gz
gentoo-8cf290c49e9435122e2d55666d5b9aba00c95f18.tar.bz2
gentoo-8cf290c49e9435122e2d55666d5b9aba00c95f18.zip
dev-python/feedparser: Clean old versions up
-rw-r--r--dev-python/feedparser/Manifest1
-rw-r--r--dev-python/feedparser/feedparser-5.1.3-r2.ebuild43
-rw-r--r--dev-python/feedparser/files/feedparser-5.1-sgmllib.patch78
-rw-r--r--dev-python/feedparser/files/feedparser-5.1.3-backport_fix_for_chardet-py3.patch32
4 files changed, 0 insertions, 154 deletions
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index 48f03ab8f76..59281c98c3d 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -1,2 +1 @@
-DIST feedparser-5.1.3.tar.bz2 202373 SHA256 7f6507d400d07edfd1ea8205da36808009b0c539f5b8a6e0ab54337b955e6dc3 SHA512 6a0374e001295566316ad86a581c875cd367fc6200e30296bf917cdff7fa2a83c05565b747c37079f38755ce94565d56890a995be7ee020d0f9466ee1b7c079b WHIRLPOOL bacb6cf0563ee7feb476ea4b767586cb6fbd649d036f72f18b60330e4b4120ccb1e65a923e121108eecf64ea2343fd7a40dd56d7bf71384ff3f52ad20a59a54b
DIST feedparser-5.2.1.tar.gz 252956 SHA256 bd030652c2d08532c034c27fcd7c85868e7fa3cb2b17f230a44a6bbc92519bf9 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81 WHIRLPOOL 7214fbafa15351d9d759b6d281e5edd4cf38f6285e0a2d788933c1336ab0e66c2587ea341773ed956d7a006e9b09f2f769876690eec9374c9f96b464f2c71ba3
diff --git a/dev-python/feedparser/feedparser-5.1.3-r2.ebuild b/dev-python/feedparser/feedparser-5.1.3-r2.ebuild
deleted file mode 100644
index 5ed973f9370..00000000000
--- a/dev-python/feedparser/feedparser-5.1.3-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Parse RSS and Atom feeds in Python"
-HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.python.org/pypi/feedparser"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-# sgmllib is licensed under PSF-2.
-LICENSE="BSD-2 PSF-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-# Tests have issues with chardet installed, and are just kind of buggy.
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-backport_fix_for_chardet-py3.patch
-)
-
-python_prepare_all() {
- mv feedparser/sgmllib3.py feedparser/_feedparser_sgmllib.py || die
- epatch "${FILESDIR}/${PN}-5.1-sgmllib.patch"
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- cp feedparser/feedparsertest.py "${BUILD_DIR}" || die
- ln -s "${S}/feedparser/tests" "${BUILD_DIR}/tests" || die
- cd "${BUILD_DIR}" || die
- if [[ ${EPYTHON} == python3* ]]; then
- 2to3 --no-diffs -w -n feedparsertest.py || die
- fi
- "${PYTHON}" feedparsertest.py || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/feedparser/files/feedparser-5.1-sgmllib.patch b/dev-python/feedparser/files/feedparser-5.1-sgmllib.patch
deleted file mode 100644
index 63c12ba0c36..00000000000
--- a/dev-python/feedparser/files/feedparser-5.1-sgmllib.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 812793c07d3202d3f5bc39091aec2e7071d000c8 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 1 Jan 2012 19:30:57 +0100
-Subject: [PATCH] Use shipped sgmllib for Python 3.x
-
----
- feedparser/feedparser.py | 19 +++----------------
- setup.py | 2 +-
- 2 files changed, 4 insertions(+), 17 deletions(-)
-
-diff --git a/feedparser/feedparser.py b/feedparser/feedparser.py
-index 8275c29..9a8a053 100644
---- a/feedparser/feedparser.py
-+++ b/feedparser/feedparser.py
-@@ -204,17 +204,9 @@ else:
- try:
- import sgmllib
- except ImportError:
-- # This is probably Python 3, which doesn't include sgmllib anymore
-- _SGML_AVAILABLE = 0
-+ import _feedparser_sgmllib as sgmllib
-
-- # Mock sgmllib enough to allow subclassing later on
-- class sgmllib(object):
-- class SGMLParser(object):
-- def goahead(self, i):
-- pass
-- def parse_starttag(self, i):
-- pass
--else:
-+if True:
- _SGML_AVAILABLE = 1
-
- # sgmllib defines a number of module-level regular expressions that are
-@@ -2520,9 +2512,6 @@ class _RelativeURIResolver(_BaseHTMLProcessor):
- _BaseHTMLProcessor.unknown_starttag(self, tag, attrs)
-
- def _resolveRelativeURIs(htmlSource, baseURI, encoding, _type):
-- if not _SGML_AVAILABLE:
-- return htmlSource
--
- p = _RelativeURIResolver(baseURI, encoding, _type)
- p.feed(htmlSource)
- return p.output()
-@@ -2803,8 +2792,6 @@ class _HTMLSanitizer(_BaseHTMLProcessor):
-
-
- def _sanitizeHTML(htmlSource, encoding, _type):
-- if not _SGML_AVAILABLE:
-- return htmlSource
- p = _HTMLSanitizer(encoding, _type)
- htmlSource = htmlSource.replace('<![CDATA[', '&lt;![CDATA[')
- p.feed(htmlSource)
-@@ -3890,7 +3877,7 @@ def parse(url_file_stream_or_string, etag=None, modified=None, agent=None, refer
- result['bozo'] = 1
- result['bozo_exception'] = feedparser.exc or e
- use_strict_parser = 0
-- if not use_strict_parser and _SGML_AVAILABLE:
-+ if not use_strict_parser:
- feedparser = _LooseFeedParser(baseuri, baselang, 'utf-8', entities)
- feedparser.feed(data.decode('utf-8', 'replace'))
- result['feed'] = feedparser.feeddata
-diff --git a/setup.py b/setup.py
-index a4a60fe..8c15451 100644
---- a/setup.py
-+++ b/setup.py
-@@ -16,7 +16,7 @@ setup(
- download_url = 'http://code.google.com/p/feedparser/',
- platforms = ['POSIX', 'Windows'],
- package_dir = {'': 'feedparser'},
-- py_modules = ['feedparser'],
-+ py_modules = ['feedparser', '_feedparser_sgmllib'],
- keywords = ['atom', 'cdf', 'feed', 'parser', 'rdf', 'rss'],
- classifiers = [
- 'Development Status :: 5 - Production/Stable',
---
-1.7.8.1
-
diff --git a/dev-python/feedparser/files/feedparser-5.1.3-backport_fix_for_chardet-py3.patch b/dev-python/feedparser/files/feedparser-5.1.3-backport_fix_for_chardet-py3.patch
deleted file mode 100644
index 6b03ddea8cb..00000000000
--- a/dev-python/feedparser/files/feedparser-5.1.3-backport_fix_for_chardet-py3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 20a32910f4a521788ba93a8c809cf0db702bed5b Mon Sep 17 00:00:00 2001
-From: Kurt McKee <contactme@kurtmckee.org>
-Date: Mon, 17 Dec 2012 10:41:13 -0600
-Subject: [PATCH] Fix chardet support in Python 3
-
-Fixes issue 384.
-Thanks to Google user Arfrever.TFA for reporting this!
----
- NEWS | 1 +
- feedparser/feedparser.py | 6 +++++-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/feedparser/feedparser.py b/feedparser/feedparser.py
-index c78e6a3..e977ae8 100644
---- a/feedparser/feedparser.py
-+++ b/feedparser/feedparser.py
-@@ -3766,7 +3766,11 @@ def convert_to_utf8(http_headers, data):
- chardet_encoding = None
- tried_encodings = []
- if chardet:
-- chardet_encoding = unicode(chardet.detect(data)['encoding'] or '', 'ascii', 'ignore')
-+ chardet_encoding = chardet.detect(data)['encoding']
-+ if not chardet_encoding:
-+ chardet_encoding = ''
-+ if not isinstance(chardet_encoding, unicode):
-+ chardet_encoding = unicode(chardet_encoding, 'ascii', 'ignore')
- # try: HTTP encoding, declared XML encoding, encoding sniffed from BOM
- for proposed_encoding in (rfc3023_encoding, xml_encoding, bom_encoding,
- chardet_encoding, u'utf-8', u'windows-1252', u'iso-8859-2'):
---
-1.8.5.5
-