[Python-modules-commits] r33633 - in packages/feedparser/trunk/debian (6 files)

[noskcaj-guest at users.alioth.debian.org]

    Date: Tuesday, August 4, 2015 @ 21:47:30
  Author: noskcaj-guest
Revision: 33633

* New upstream release
* Drop chardet.diff, fixed upstream
* Drop debian/upstream/, no longer needed

Modified:
  packages/feedparser/trunk/debian/changelog
  packages/feedparser/trunk/debian/patches/series
  packages/feedparser/trunk/debian/patches/sgmllib3.patch
  packages/feedparser/trunk/debian/rules
Deleted:
  packages/feedparser/trunk/debian/patches/chardet.diff
  packages/feedparser/trunk/debian/upstream/

Modified: packages/feedparser/trunk/debian/changelog
===================================================================
--- packages/feedparser/trunk/debian/changelog	2015-08-04 20:19:56 UTC (rev 33632)
+++ packages/feedparser/trunk/debian/changelog	2015-08-04 21:47:30 UTC (rev 33633)
@@ -1,3 +1,11 @@
+feedparser (5.2.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * Drop chardet.diff, fixed upstream
+  * Drop debian/upstream/, no longer needed
+
+ -- Jackson Doak <noskcaj at ubuntu.com>  Wed, 05 Aug 2015 07:41:38 +1000
+
 feedparser (5.1.3-3) unstable; urgency=medium
 
   * Fix HTTP auth in python 3 (Closes: #760078)

Deleted: packages/feedparser/trunk/debian/patches/chardet.diff
===================================================================
--- packages/feedparser/trunk/debian/patches/chardet.diff	2015-08-04 20:19:56 UTC (rev 33632)
+++ packages/feedparser/trunk/debian/patches/chardet.diff	2015-08-04 21:47:30 UTC (rev 33633)
@@ -1,25 +0,0 @@
-Bug:    http://code.google.com/p/feedparser/issues/detail?id=384
-Origin: commit:20a32910f4a521788ba93a8c809cf0db702bed5b
-Author: Kurt McKee <contactme at kurtmckee.org>
-Date:   Mon Dec 17 10:41:13 2012 -0600
-
-    Fix chardet support in Python 3
-    
-    Fixes issue 384.
-    Thanks to Google user Arfrever.TFA for reporting this!
-
---- a/feedparser/feedparser.py
-+++ b/feedparser/feedparser.py
-@@ -3774,7 +3774,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, 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'):

Modified: packages/feedparser/trunk/debian/patches/series
===================================================================
--- packages/feedparser/trunk/debian/patches/series	2015-08-04 20:19:56 UTC (rev 33632)
+++ packages/feedparser/trunk/debian/patches/series	2015-08-04 21:47:30 UTC (rev 33633)
@@ -1,4 +1,3 @@
 sgmllib3.patch
-chardet.diff
 redirect-status.patch
 python3-auth.patch

Modified: packages/feedparser/trunk/debian/patches/sgmllib3.patch
===================================================================
--- packages/feedparser/trunk/debian/patches/sgmllib3.patch	2015-08-04 20:19:56 UTC (rev 33632)
+++ packages/feedparser/trunk/debian/patches/sgmllib3.patch	2015-08-04 21:47:30 UTC (rev 33633)
@@ -7,9 +7,9 @@
 --- a/feedparser/feedparser.py
 +++ b/feedparser/feedparser.py
 @@ -205,22 +205,30 @@
+ 
  # sgmllib is not available by default in Python 3; if the end user doesn't have
- # it available then we'll lose illformed XML parsing, content santizing, and
- # microformat support (at least while feedparser depends on BeautifulSoup).
+ # it available then we'll lose illformed XML parsing and content santizing
 +_SGML_AVAILABLE = 0
  try:
      import sgmllib

Modified: packages/feedparser/trunk/debian/rules
===================================================================
--- packages/feedparser/trunk/debian/rules	2015-08-04 20:19:56 UTC (rev 33632)
+++ packages/feedparser/trunk/debian/rules	2015-08-04 21:47:30 UTC (rev 33633)
@@ -18,9 +18,6 @@
 	rm -rf build .*egg-info
 
 override_dh_auto_test:
-	# Add back data files which were missing in upstream tarball for 5.1
-	cp $(CURDIR)/debian/upstream/*.z feedparser/tests/compression
-	cp $(CURDIR)/debian/upstream/*.gz feedparser/tests/compression
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	cd feedparser && python ./feedparsertest.py
 	# FIXME: run tests for python3 too.  This requires running 2to3 over