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__.
This commit is contained in:
Lance Stout
2010-08-05 20:26:41 -04:00
parent 58f77d898f
commit e077204a16
8 changed files with 298 additions and 343 deletions

View File

@@ -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']