[arch-commits] Commit in python-feedparser/trunk (2 files)

[Evangelos Foutras]

    Date: Monday, December 31, 2012 @ 07:25:10
  Author: foutrelis
Revision: 173992

upgpkg: python-feedparser 5.1.3-2

Fix FS#33254: [python-feedparse] broken when python-chardet is installed

Added:
  python-feedparser/trunk/fix-chardet-support-in-python-3.patch
Modified:
  python-feedparser/trunk/PKGBUILD

---------------------------------------+
 PKGBUILD                              |   14 +++++++++++---
 fix-chardet-support-in-python-3.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-31 12:12:30 UTC (rev 173991)
+++ PKGBUILD	2012-12-31 12:25:10 UTC (rev 173992)
@@ -4,17 +4,25 @@
 pkgbase=python-feedparser
 pkgname=('python2-feedparser' 'python-feedparser' 'python-sgmllib')
 pkgver=5.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Parse RSS and Atom feeds in Python"
 arch=('any')
 url="http://code.google.com/p/feedparser/"
 license=('custom')
 makedepends=('python' 'python2' 'libxml2' 'python2-distribute' 'python-distribute')
-source=(http://feedparser.googlecode.com/files/feedparser-${pkgver}.tar.bz2)
-sha1sums=('dfe654e4babd258b1402b89e889d78330206d78c')
+source=(http://feedparser.googlecode.com/files/feedparser-${pkgver}.tar.bz2
+        fix-chardet-support-in-python-3.patch)
+sha1sums=('dfe654e4babd258b1402b89e889d78330206d78c'
+          '18f6a1290b5d7a256b7bf3d1a41b9a7dd2706cf3')
 
 build() {
   cd "${srcdir}"
+
+  # http://code.google.com/p/feedparser/issues/detail?id=384
+  # https://bugs.archlinux.org/task/33254
+  patch -d "feedparser-$pkgver" -Np1 -i \
+    "$srcdir/fix-chardet-support-in-python-3.patch"
+
   chmod 644  feedparser-${pkgver}/feedparser/feedparser.egg-info/*
   cp -r feedparser-${pkgver} feedparser-${pkgver}-python2
   cp -r feedparser-${pkgver} feedparser-${pkgver}-python

Added: fix-chardet-support-in-python-3.patch
===================================================================
--- fix-chardet-support-in-python-3.patch	                        (rev 0)
+++ fix-chardet-support-in-python-3.patch	2012-12-31 12:25:10 UTC (rev 173992)
@@ -0,0 +1,32 @@
+From 20a32910f4a521788ba93a8c809cf0db702bed5b Mon Sep 17 00:00:00 2001
+From: Kurt McKee <contactme at 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.0.3
+