Update to 2.3. From the changelog:

- add SKIP_INTERNAL_LINKS (tx Christian Siefkes)
- prelim JS support, various fixes, improved performances (tx Johannes Fitz)

3 files changed, 35 insertions, 35 deletions

diff --git a/textproc/py-html2text/Makefile b/textproc/py-html2text/Makefile
index c26b5d1e444..6ff406667e8 100644
--- a/textproc/py-html2text/Makefile
+++ b/textproc/py-html2text/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2008/04/28 22:51:30 schmonz Exp $
+# $NetBSD: Makefile,v 1.10 2008/06/01 04:52:15 schmonz Exp $
 #
 
-DISTNAME=		html2text-2.291
+DISTNAME=		html2text-2.3
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		textproc python
 MASTER_SITES=		${HOMEPAGE}
diff --git a/textproc/py-html2text/distinfo b/textproc/py-html2text/distinfo
index b0f071d2535..1b09474fc22 100644
--- a/textproc/py-html2text/distinfo
+++ b/textproc/py-html2text/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2008/04/28 22:51:30 schmonz Exp $
+$NetBSD: distinfo,v 1.8 2008/06/01 04:52:15 schmonz Exp $
 
-SHA1 (html2text-2.291.py) = f37d0028ab6e8b8edd7632835851f49960fae081
-RMD160 (html2text-2.291.py) = 78ddc6210579c07f6871c766b76b0d6a20ce917b
-Size (html2text-2.291.py) = 10045 bytes
-SHA1 (patch-aa) = 41781f6a893ef6d883c65110928e2b072102924a
+SHA1 (html2text-2.3.py) = 5cd6bb95b0e519a89e212354f82f9e0a6960a3a2
+RMD160 (html2text-2.3.py) = 5a5e05485daed9ea2f4af79358123aefb60a51b9
+Size (html2text-2.3.py) = 12987 bytes
+SHA1 (patch-aa) = da6f7f48c276ff115f2d27692fbe41221c1845ce
diff --git a/textproc/py-html2text/patches/patch-aa b/textproc/py-html2text/patches/patch-aa
index e16ae1c57d0..fd2511ee06a 100644
--- a/textproc/py-html2text/patches/patch-aa
+++ b/textproc/py-html2text/patches/patch-aa
@@ -1,30 +1,30 @@
-$NetBSD: patch-aa,v 1.3 2008/02/19 10:31:54 schmonz Exp $
+$NetBSD: patch-aa,v 1.4 2008/06/01 04:52:15 schmonz Exp $
 
---- html2text.py.orig	2008-02-13 16:24:14.000000000 -0500
+--- html2text.py.orig	2008-06-01 00:37:59.000000000 -0400
 +++ html2text.py
-@@ -150,7 +150,7 @@ class _html2text(sgmllib.SGMLParser):
- 		self.lastWasNL = 0
- 	
- 	def outtextf(self, s): 
--		if type(s) is type(''): s = codecs.utf_8_decode(s)[0]
-+		if type(s) is type(''): s = codecs.utf_8_decode(s, "replace")[0]
- 		self.outtext += s
- 	
- 	def close(self):
-@@ -262,6 +262,7 @@ class _html2text(sgmllib.SGMLParser):
- 			if attrs.has_key('src'):
- 				attrs['href'] = attrs['src']
- 				alt = attrs.get('alt', '')
-+				alt = re.sub('\n', ' ', alt)
- 				i = self.previousIndex(attrs)
- 				if i is not None:
- 					attrs = self.a[i]
-@@ -282,7 +283,7 @@ class _html2text(sgmllib.SGMLParser):
- 		if tag in ["ol", "ul"]:
- 			if start:
- 				self.list.append({'name':tag, 'num':0})
--			else:
-+			elif self.list:
- 				if self.list: self.list.pop()
- 			
- 			self.p()
+@@ -155,7 +155,7 @@ class _html2text(sgmllib.SGMLParser):
+         self.lastWasNL = 0
+     
+     def outtextf(self, s): 
+-        if type(s) is type(''): s = codecs.utf_8_decode(s)[0]
++        if type(s) is type(''): s = codecs.utf_8_decode(s, "replace")[0]
+         self.outtext += s
+     
+     def close(self):
+@@ -267,6 +267,7 @@ class _html2text(sgmllib.SGMLParser):
+             if attrs.has_key('src'):
+                 attrs['href'] = attrs['src']
+                 alt = attrs.get('alt', '')
++                alt = re.sub('\n', ' ', alt)
+                 i = self.previousIndex(attrs)
+                 if i is not None:
+                     attrs = self.a[i]
+@@ -287,7 +288,7 @@ class _html2text(sgmllib.SGMLParser):
+         if tag in ["ol", "ul"]:
+             if start:
+                 self.list.append({'name':tag, 'num':0})
+-            else:
++            elif self.list:
+                 if self.list: self.list.pop()
+             
+             self.p()