diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-07-24 20:01:18 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-07-24 20:01:18 -0700 |
| commit | c42f1ad4c79863261977a9c5ea3b33be0b51b946 (patch) | |
| tree | 8eee86ddb082f51dea0866f16146bcd1f4f13c1f /tests/test_tostring.py | |
| parent | a3ec1af2053bc0be4864ae290e6e5fc39f3fd5fe (diff) | |
| parent | 9d8de7fc15afc39a666d2ac16b62a068dfc55112 (diff) | |
| download | slixmpp-c42f1ad4c79863261977a9c5ea3b33be0b51b946.tar.gz slixmpp-c42f1ad4c79863261977a9c5ea3b33be0b51b946.tar.bz2 slixmpp-c42f1ad4c79863261977a9c5ea3b33be0b51b946.tar.xz slixmpp-c42f1ad4c79863261977a9c5ea3b33be0b51b946.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'tests/test_tostring.py')
| -rw-r--r-- | tests/test_tostring.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_tostring.py b/tests/test_tostring.py index e456d28e..cd50a7c1 100644 --- a/tests/test_tostring.py +++ b/tests/test_tostring.py @@ -1,7 +1,7 @@ from sleekxmpp.test import * from sleekxmpp.stanza import Message from sleekxmpp.xmlstream.stanzabase import ET, ElementBase -from sleekxmpp.xmlstream.tostring import tostring, xml_escape +from sleekxmpp.xmlstream.tostring import tostring, escape class TestToString(SleekTest): @@ -30,7 +30,7 @@ class TestToString(SleekTest): def testXMLEscape(self): """Test escaping XML special characters.""" original = """<foo bar="baz">'Hi & welcome!'</foo>""" - escaped = xml_escape(original) + escaped = escape(original) desired = """<foo bar="baz">'Hi""" desired += """ & welcome!'</foo>""" |