From poyopoyo@puripuri.plala.or.jp  Sun Mar  9 17:12:59 2014
Return-Path: <poyopoyo@puripuri.plala.or.jp>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 19A2FE63
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Mar 2014 17:12:59 +0000 (UTC)
Received: from msa01b.plala.or.jp (msa01.plala.or.jp [IPv6:2400:7800:0:5010::1])
	by mx1.freebsd.org (Postfix) with ESMTP id A4A7CF58
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Mar 2014 17:12:58 +0000 (UTC)
Received: from i58-95-111-97.s02.a026.ap.plala.or.jp ([58.95.111.97])
          by msa01b.plala.or.jp with ESMTP
          id <20140309171250.YCDM4134.msa01b.plala.or.jp@i58-95-111-97.s02.a026.ap.plala.or.jp>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Mon, 10 Mar 2014 02:12:50 +0900
Message-Id: <86zjkzuwia.wl%poyopoyo@puripuri.plala.or.jp>
Date: Mon, 10 Mar 2014 02:12:13 +0900
From: poyopoyo@puripuri.plala.or.jp
To: FreeBSD-gnats-submit@freebsd.org
Subject: [PATCH] textproc/py-feedparser: backport fix with chardet issue

>Number:         187397
>Category:       ports
>Synopsis:       [PATCH] textproc/py-feedparser: backport fix with chardet issue
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sbz
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 09 17:20:00 UTC 2014
>Closed-Date:    Thu May 22 10:17:57 UTC 2014
>Last-Modified:  Thu May 22 10:20:00 UTC 2014
>Originator:     SATO Kuro
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
personal
>Environment:
>Description:

Backport a fix for chardet issue which prevents mail/rss2email3 from
working correctly on certain environment. As this fix is from
feedparser development tree, it will be incorporated in the next
release.

http://code.google.com/p/feedparser/source/detail?r=20a32910f4a5
| Commit Date: 	Dec 17, 2012
| Log message
| Fix chardet support in Python 3
| Fixes  issue 384 .
| Thanks to Google user Arfrever.TFA for reporting this!

>How-To-Repeat:

$ r2e run
error while running time limited function: decoding str is not supported
cause: decoding str is not supported
error while running time limited function: decoding str is not supported
cause: decoding str is not supported
...
error while running time limited function: decoding str is not supported
cause: decoding str is not supported
$ 

>Fix:
Index: Makefile
===================================================================
--- Makefile	(revision 347660)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	feedparser
 PORTVERSION=	5.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
Index: files/patch-feedparser_feedparser.py
===================================================================
--- files/patch-feedparser_feedparser.py	(revision 0)
+++ files/patch-feedparser_feedparser.py	(working copy)
@@ -0,0 +1,15 @@
+--- feedparser/feedparser.py.orig	2014-03-10 01:45:12.000000000 +0900
++++ feedparser/feedparser.py	2014-03-10 01:45:53.000000000 +0900
+@@ -3766,7 +3766,11 @@
+     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, str):
++            chardet_encoding = str(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'):

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sbz 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Mar 9 17:20:08 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187397 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Thu May 22 10:17:56 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187397 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/187397: commit references a PR
Date: Thu, 22 May 2014 10:17:45 +0000 (UTC)

 Author: miwi
 Date: Thu May 22 10:17:41 2014
 New Revision: 354821
 URL: http://svnweb.freebsd.org/changeset/ports/354821
 QAT: https://qat.redports.org/buildarchive/r354821/
 
 Log:
   - Backport a fix for chardet issue which prevents mail/rss2email3 from
     working correctly on certain environment.
   
   PR:		187397
   Submitted by:	poyopoyo@puripuri.plala.or.jp
   Approved by:	maintainer timeout
 
 Added:
   head/textproc/py-feedparser/files/patch-feedparser_feedparser.py   (contents, props changed)
 Modified:
   head/textproc/py-feedparser/Makefile
 
 Modified: head/textproc/py-feedparser/Makefile
 ==============================================================================
 --- head/textproc/py-feedparser/Makefile	Thu May 22 10:16:15 2014	(r354820)
 +++ head/textproc/py-feedparser/Makefile	Thu May 22 10:17:41 2014	(r354821)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	feedparser
  PORTVERSION=	5.1.3
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	textproc python
  MASTER_SITES=	CHEESESHOP
  PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 Added: head/textproc/py-feedparser/files/patch-feedparser_feedparser.py
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/textproc/py-feedparser/files/patch-feedparser_feedparser.py	Thu May 22 10:17:41 2014	(r354821)
 @@ -0,0 +1,15 @@
 +--- feedparser/feedparser.py.orig	2014-03-10 01:45:12.000000000 +0900
 ++++ feedparser/feedparser.py	2014-03-10 01:45:53.000000000 +0900
 +@@ -3766,7 +3766,11 @@
 +     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, str):
 ++            chardet_encoding = str(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'):
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
