Update to 0.23. Changes not found.

Remove unnecessary patches (for python-3.x compat).

4 files changed, 6 insertions, 83 deletions

diff --git a/textproc/py-markupsafe/Makefile b/textproc/py-markupsafe/Makefile
index d630929abbc..4f6356dbc8d 100644
--- a/textproc/py-markupsafe/Makefile
+++ b/textproc/py-markupsafe/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2014/04/25 08:55:41 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2014/05/14 08:45:07 wiz Exp $
 
-DISTNAME=	MarkupSafe-0.21
+DISTNAME=	MarkupSafe-0.23
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	textproc python
 MASTER_SITES=	http://pypi.python.org/packages/source/M/MarkupSafe/
diff --git a/textproc/py-markupsafe/distinfo b/textproc/py-markupsafe/distinfo
index 4b5cf38a11f..0f5a7ddb9a7 100644
--- a/textproc/py-markupsafe/distinfo
+++ b/textproc/py-markupsafe/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.6 2014/04/25 08:55:41 wiz Exp $
+$NetBSD: distinfo,v 1.7 2014/05/14 08:45:07 wiz Exp $
 
-SHA1 (MarkupSafe-0.21.tar.gz) = 35248d9dbba35882099e402813423edbb5bd3efc
-RMD160 (MarkupSafe-0.21.tar.gz) = f5aefbb46113b8a8d921ce551f034e3f2c94ca23
-Size (MarkupSafe-0.21.tar.gz) = 13091 bytes
-SHA1 (patch-markupsafe_____init____.py) = 7f4a4dfc74ebcd49359aa685d055a09f1bf57cdf
-SHA1 (patch-markupsafe_tests.py) = 17f11a7763b5995ea273e7e302d5979734959b06
+SHA1 (MarkupSafe-0.23.tar.gz) = cd5c22acf6dd69046d6cb6a3920d84ea66bdf62a
+RMD160 (MarkupSafe-0.23.tar.gz) = 8d1dd780a46a18b6f6bad78bf92eeca2d06a1f54
+Size (MarkupSafe-0.23.tar.gz) = 13416 bytes
diff --git a/textproc/py-markupsafe/patches/patch-markupsafe_____init____.py b/textproc/py-markupsafe/patches/patch-markupsafe_____init____.py
deleted file mode 100644
index bec76124bef..00000000000
--- a/textproc/py-markupsafe/patches/patch-markupsafe_____init____.py
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-markupsafe_____init____.py,v 1.1 2013/05/23 15:08:26 joerg Exp $
-
---- markupsafe/__init__.py.orig	2013-05-23 10:39:34.000000000 +0000
-+++ markupsafe/__init__.py
-@@ -65,7 +65,7 @@ class Markup(text_type):
-     """
-     __slots__ = ()
- 
--    def __new__(cls, base=u'', encoding=None, errors='strict'):
-+    def __new__(cls, base='', encoding=None, errors='strict'):
-         if hasattr(base, '__html__'):
-             base = base.__html__()
-         if encoding is None:
-@@ -139,7 +139,7 @@ class Markup(text_type):
-                     return unichr(int(name[1:]))
-             except ValueError:
-                 pass
--            return u''
-+            return ''
-         return _entity_re.sub(handle_match, text_type(self))
- 
-     def striptags(self):
-@@ -150,7 +150,7 @@ class Markup(text_type):
-         >>> Markup("Main &raquo;  <em>About</em>").striptags()
-         u'Main \xbb About'
-         """
--        stripped = u' '.join(_striptags_re.sub('', self).split())
-+        stripped = ' '.join(_striptags_re.sub('', self).split())
-         return Markup(stripped).unescape()
- 
-     @classmethod
diff --git a/textproc/py-markupsafe/patches/patch-markupsafe_tests.py b/textproc/py-markupsafe/patches/patch-markupsafe_tests.py
deleted file mode 100644
index 919ea39744e..00000000000
--- a/textproc/py-markupsafe/patches/patch-markupsafe_tests.py
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-markupsafe_tests.py,v 1.1 2013/05/23 15:08:26 joerg Exp $
-
---- markupsafe/tests.py.orig	2013-05-23 10:40:08.000000000 +0000
-+++ markupsafe/tests.py
-@@ -48,16 +48,16 @@ class MarkupTestCase(unittest.TestCase):
-         self.assertEqual(Markup('<em>%s:%s</em>') % (
-             '<foo>',
-             '<bar>',
--        ), Markup(u'<em>&lt;foo&gt;:&lt;bar&gt;</em>'))
-+        ), Markup('<em>&lt;foo&gt;:&lt;bar&gt;</em>'))
- 
-     def test_dict_interpol(self):
-         self.assertEqual(Markup('<em>%(foo)s</em>') % {
-             'foo': '<foo>',
--        }, Markup(u'<em>&lt;foo&gt;</em>'))
-+        }, Markup('<em>&lt;foo&gt;</em>'))
-         self.assertEqual(Markup('<em>%(foo)s:%(bar)s</em>') % {
-             'foo': '<foo>',
-             'bar': '<bar>',
--        }, Markup(u'<em>&lt;foo&gt;:&lt;bar&gt;</em>'))
-+        }, Markup('<em>&lt;foo&gt;:&lt;bar&gt;</em>'))
- 
-     def test_escaping(self):
-         # escaping and unescaping
-@@ -73,7 +73,7 @@ class MarkupTestCase(unittest.TestCase):
-     def test_escape_silent(self):
-         assert escape_silent(None) == Markup()
-         assert escape(None) == Markup(None)
--        assert escape_silent('<foo>') == Markup(u'&lt;foo&gt;')
-+        assert escape_silent('<foo>') == Markup('&lt;foo&gt;')
- 
-     def test_splitting(self):
-         self.assertEqual(Markup('a b').split(), [
-@@ -101,8 +101,8 @@ class MarkupLeakTestCase(unittest.TestCa
-             for item in range(1000):
-                 escape("foo")
-                 escape("<foo>")
--                escape(u"foo")
--                escape(u"<foo>")
-+                escape("foo")
-+                escape("<foo>")
-             counts.add(len(gc.get_objects()))
-         assert len(counts) == 1, 'ouch, c extension seems to leak objects'
-