Fix regression in twisted.words.protocols.jabber.jstrports.parse() (bug #351468).

Straight to stable on architectures, on which 10.2.0 was stable.

(Portage version: 2.2.0_alpha17_p13/cvs/Linux x86_64)

3 files changed, 83 insertions, 3 deletions

diff --git a/dev-python/twisted-words/ChangeLog b/dev-python/twisted-words/ChangeLog
index a40a881bcc1a..858a104ee90f 100644
--- a/dev-python/twisted-words/ChangeLog
+++ b/dev-python/twisted-words/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/twisted-words
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/ChangeLog,v 1.57 2011/01/12 14:16:23 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/ChangeLog,v 1.58 2011/01/19 20:48:07 arfrever Exp $
+
+*twisted-words-10.2.0-r1 (19 Jan 2011)
+
+  19 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -twisted-words-10.2.0.ebuild, +twisted-words-10.2.0-r1.ebuild,
+  +files/twisted-words-10.2.0-twisted.words.protocols.jabber.jstrports.parse.patch:
+  Fix regression in twisted.words.protocols.jabber.jstrports.parse() (bug #351468).
+  Straight to stable on architectures, on which 10.2.0 was stable.
 
   12 Jan 2011; Markos Chandras <hwoarang@gentoo.org>
   twisted-words-10.2.0.ebuild:
diff --git a/dev-python/twisted-words/files/twisted-words-10.2.0-twisted.words.protocols.jabber.jstrports.parse.patch b/dev-python/twisted-words/files/twisted-words-10.2.0-twisted.words.protocols.jabber.jstrports.parse.patch
new file mode 100644
index 000000000000..2f70d8e94cf0
--- /dev/null
+++ b/dev-python/twisted-words/files/twisted-words-10.2.0-twisted.words.protocols.jabber.jstrports.parse.patch
@@ -0,0 +1,67 @@
+https://bugs.gentoo.org/show_bug.cgi?id=351468
+http://twistedmatrix.com/trac/ticket/4771
+http://twistedmatrix.com/trac/changeset/30430
+
+--- twisted/words/protocols/jabber/jstrports.py
++++ twisted/words/protocols/jabber/jstrports.py
+@@ -1,12 +1,12 @@
+ # -*- test-case-name: twisted.words.test -*-
+-# Copyright (c) 2001-2005 Twisted Matrix Laboratories.
++# Copyright (c) 2001-2011 Twisted Matrix Laboratories.
+ # See LICENSE for details.
+ 
+ 
+ """ A temporary placeholder for client-capable strports, until we
+ sufficient use cases get identified """
+ 
+-from twisted.application import strports
++from twisted.internet.endpoints import _parse
+ 
+ def _parseTCPSSL(factory, domain, port):
+     """ For the moment, parse TCP or SSL connections the same """
+@@ -22,7 +22,7 @@
+ 
+ 
+ def parse(description, factory):
+-    args, kw = strports._parse(description)
++    args, kw = _parse(description)
+     return (args[0].upper(),) + _funcs[args[0]](factory, *args[1:], **kw)
+ 
+ def client(description, factory):
+--- twisted/words/test/test_jabberjstrports.py
++++ twisted/words/test/test_jabberjstrports.py
+@@ -0,0 +1,34 @@
++# Copyright (c) 2011 Twisted Matrix Laboratories.
++# See LICENSE for details.
++
++"""
++Tests for L{twisted.words.protocols.jabber.jstrports}.
++"""
++
++from twisted.trial import unittest
++
++from twisted.words.protocols.jabber import jstrports
++from twisted.application.internet import TCPClient
++
++
++class JabberStrPortsPlaceHolderTest(unittest.TestCase):
++    """
++    Tests for L{jstrports}
++    """
++
++    def test_parse(self):
++        """
++        L{jstrports.parse} accepts an endpoint description string and returns a
++        tuple and dict of parsed endpoint arguments.
++        """
++        expected = ('TCP', ('DOMAIN', 65535, 'Factory'), {})
++        got = jstrports.parse("tcp:DOMAIN:65535", "Factory")
++        self.assertEquals(expected, got)
++
++
++    def test_client(self):
++        """
++        L{jstrports.client} returns a L{TCPClient} service.
++        """
++        got = jstrports.client("tcp:DOMAIN:65535", "Factory")
++        self.assertIsInstance(got, TCPClient)
diff --git a/dev-python/twisted-words/twisted-words-10.2.0.ebuild b/dev-python/twisted-words/twisted-words-10.2.0-r1.ebuild
index 47dc76e7abb0..c3b587276c34 100644
--- a/dev-python/twisted-words/twisted-words-10.2.0.ebuild
+++ b/dev-python/twisted-words/twisted-words-10.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-10.2.0.ebuild,v 1.5 2011/01/12 14:16:23 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-10.2.0-r1.ebuild,v 1.1 2011/01/19 20:48:07 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -8,7 +8,7 @@ SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 MY_PACKAGE="Words"
 
-inherit twisted
+inherit eutils twisted
 
 DESCRIPTION="Twisted Words contains Instant Messaging implementations."
 
@@ -21,6 +21,11 @@ RDEPEND="${DEPEND}"
 
 PYTHON_MODNAME="twisted/plugins twisted/words"
 
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/${P}-twisted.words.protocols.jabber.jstrports.parse.patch"
+}
+
 src_install() {
 	twisted_src_install