summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_xmlrpc.py
diff options
context:
space:
mode:
authorWalter Dörwald <walter@livinglogic.de>2007-06-08 14:30:53 (GMT)
committerWalter Dörwald <walter@livinglogic.de>2007-06-08 14:30:53 (GMT)
commit9b775535f828bedc30f3f52a04afec049b6aa25a (patch)
tree12b9a0e80636c157457d827a7436e77d843e03b3 /Lib/test/test_xmlrpc.py
parent0157ebe999e951a4a3a5296586b08f4f96384bb3 (diff)
downloadcpython-9b775535f828bedc30f3f52a04afec049b6aa25a.zip
cpython-9b775535f828bedc30f3f52a04afec049b6aa25a.tar.gz
cpython-9b775535f828bedc30f3f52a04afec049b6aa25a.tar.bz2
Rename checks for test_support.have_unicode (we always
have unicode support now) and either drop the tests or merge them into the existing tests.
Diffstat (limited to 'Lib/test/test_xmlrpc.py')
-rw-r--r--Lib/test/test_xmlrpc.py21
1 files changed, 5 insertions, 16 deletions
diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py
index 1bf6294..bc8a7cf 100644
--- a/Lib/test/test_xmlrpc.py
+++ b/Lib/test/test_xmlrpc.py
@@ -4,13 +4,6 @@ import unittest
import xmlrpclib
from test import test_support
-try:
- str
-except NameError:
- have_unicode = False
-else:
- have_unicode = True
-
alist = [{'astring': 'foo@bar.baz.spam',
'afloat': 7283.43,
'anint': 2**20,
@@ -147,15 +140,11 @@ class XMLRPCTestCase(unittest.TestCase):
del sys.setdefaultencoding
items = list(d.items())
- if have_unicode:
- self.assertEquals(s, "abc \x95")
- self.assert_(isinstance(s, str))
- self.assertEquals(items, [("def \x96", "ghi \x97")])
- self.assert_(isinstance(items[0][0], str))
- self.assert_(isinstance(items[0][1], str))
- else:
- self.assertEquals(s, "abc \xc2\x95")
- self.assertEquals(items, [("def \xc2\x96", "ghi \xc2\x97")])
+ self.assertEquals(s, "abc \x95")
+ self.assert_(isinstance(s, str))
+ self.assertEquals(items, [("def \x96", "ghi \x97")])
+ self.assert_(isinstance(items[0][0], str))
+ self.assert_(isinstance(items[0][1], str))
def test_main():
test_support.run_unittest(XMLRPCTestCase)