From c54466596f3dcc7a35a41c49fff0d057d4a8ed8f Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Wed, 4 Aug 2010 14:41:37 -0400
Subject: Modified sleekxmpp.xmlstream.tostring to import ToString class based
 on Python version.

The package sleekxmpp.xmlstream.tostring26 remains for now until stanzabase is updated, but is no longer needed.
---
 sleekxmpp/xmlstream/tostring/__init__.py | 70 ++++++--------------------------
 1 file changed, 12 insertions(+), 58 deletions(-)

(limited to 'sleekxmpp/xmlstream/tostring/__init__.py')

diff --git a/sleekxmpp/xmlstream/tostring/__init__.py b/sleekxmpp/xmlstream/tostring/__init__.py
index 6603cbb8..d93fe4ea 100644
--- a/sleekxmpp/xmlstream/tostring/__init__.py
+++ b/sleekxmpp/xmlstream/tostring/__init__.py
@@ -1,60 +1,14 @@
+"""
 
-class ToString(object):
-	def __str__(self, xml=None, xmlns='', stringbuffer=''):
-		if xml is None:
-			xml = self.xml
-		newoutput = [stringbuffer]
-		#TODO respect ET mapped namespaces
-		itag = xml.tag.split('}', 1)[-1]
-		if '}' in xml.tag:
-			ixmlns = xml.tag.split('}', 1)[0][1:]
-		else:
-			ixmlns = ''
-		nsbuffer = ''
-		if xmlns != ixmlns and ixmlns != '' and ixmlns != self.namespace:
-			if self.stream is not None and ixmlns in self.stream.namespace_map:
-				if self.stream.namespace_map[ixmlns] != '':
-					itag = "%s:%s" % (self.stream.namespace_map[ixmlns], itag)
-			else:
-				nsbuffer = """ xmlns="%s\"""" % ixmlns
-		if ixmlns not in ('', xmlns, self.namespace):
-			nsbuffer = """ xmlns="%s\"""" % ixmlns
-		newoutput.append("<%s" % itag)
-		newoutput.append(nsbuffer)
-		for attrib in xml.attrib:
-			if '{' not in attrib:
-				newoutput.append(""" %s="%s\"""" % (attrib, self.xmlesc(xml.attrib[attrib])))
-		if len(xml) or xml.text or xml.tail:
-			newoutput.append(">")
-			if xml.text:
-				newoutput.append(self.xmlesc(xml.text))
-			if len(xml):
-				for child in xml.getchildren():
-					newoutput.append(self.__str__(child, ixmlns))
-			newoutput.append("</%s>" % (itag, ))
-			if xml.tail:
-				newoutput.append(self.xmlesc(xml.tail))
-		elif xml.text:
-			newoutput.append(">%s</%s>" % (self.xmlesc(xml.text), itag))
-		else:
-			newoutput.append(" />")
-		return ''.join(newoutput)
+"""
 
-	def xmlesc(self, text):
-		text = list(text)
-		cc = 0
-		matches = ('&', '<', '"', '>', "'")
-		for c in text:
-			if c in matches:
-				if c == '&':
-					text[cc] = '&amp;'
-				elif c == '<':
-					text[cc] = '&lt;'
-				elif c == '>':
-					text[cc] = '&gt;'
-				elif c == "'":
-					text[cc] = '&apos;'
-				else:
-					text[cc] = '&quot;'
-			cc += 1
-		return ''.join(text)
+import sys
+
+
+# Import the correct ToString class based on the Python version.
+if sys.version_info < (3, 0):
+    from sleekxmpp.xmlstream.tostring.tostring26 import ToString
+else:
+    from sleekxmpp.xmlstream.tostring.tostring import ToString
+
+__all__ = ['ToString']
-- 
cgit v1.2.3


From e077204a16c76df4af90ba067e94c31af3d9e372 Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Thu, 5 Aug 2010 20:26:41 -0400
Subject: Replaced the ToString class with a tostring function.

The sleekxmpp.xmlstream.tostring and sleekxmpp.xmlstream.tostring26 packages
have been merged to sleekxmpp.xmlstream.tostring. The __init__.py file will
import the appropriate tostring function depending on the Python version.

The setup.py file has been updated with the package changes.

ElementBase is now a direct descendent of object and does not subclass ToString.

Stanza objects now return their XML contents for __repr__.
---
 sleekxmpp/xmlstream/tostring/__init__.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'sleekxmpp/xmlstream/tostring/__init__.py')

diff --git a/sleekxmpp/xmlstream/tostring/__init__.py b/sleekxmpp/xmlstream/tostring/__init__.py
index d93fe4ea..5852cba2 100644
--- a/sleekxmpp/xmlstream/tostring/__init__.py
+++ b/sleekxmpp/xmlstream/tostring/__init__.py
@@ -1,14 +1,19 @@
 """
+    SleekXMPP: The Sleek XMPP Library
+    Copyright (C) 2010  Nathanael C. Fritz
+    This file is part of SleekXMPP.
 
+    See the file LICENSE for copying permission.
 """
 
 import sys
 
+# Import the correct tostring and xml_escape functions based on the Python
+# version in order to properly handle Unicode.
 
-# Import the correct ToString class based on the Python version.
 if sys.version_info < (3, 0):
-    from sleekxmpp.xmlstream.tostring.tostring26 import ToString
+    from sleekxmpp.xmlstream.tostring.tostring26 import tostring, xml_escape
 else:
-    from sleekxmpp.xmlstream.tostring.tostring import ToString
+    from sleekxmpp.xmlstream.tostring.tostring import tostring, xml_escape
 
-__all__ = ['ToString']
+__all__ = ['tostring', 'xml_escape']
-- 
cgit v1.2.3