diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/feedparser/files/feedparser-5.1.3-backport_fix_for_chardet-py3.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-python/feedparser/files/feedparser-5.1.3-backport_fix_for_chardet-py3.patch')
-rw-r--r-- | dev-python/feedparser/files/feedparser-5.1.3-backport_fix_for_chardet-py3.patch | 32 |
1 files changed, 32 insertions, 0 deletions
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 new file mode 100644 index 000000000000..6b03ddea8cbb --- /dev/null +++ b/dev-python/feedparser/files/feedparser-5.1.3-backport_fix_for_chardet-py3.patch @@ -0,0 +1,32 @@ +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 + |