summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorWalter Dörwald <walter@livinglogic.de>2005-07-28 16:49:15 (GMT)
committerWalter Dörwald <walter@livinglogic.de>2005-07-28 16:49:15 (GMT)
commit6eea789fd2ab75c14b02e23713ad380498be0a06 (patch)
tree6a84a07ce428c456a63657b72f91f857769e9f78 /Lib
parent97bb8ad3949262d8d1a703ad8d2e514c1c85b433 (diff)
downloadcpython-6eea789fd2ab75c14b02e23713ad380498be0a06.zip
cpython-6eea789fd2ab75c14b02e23713ad380498be0a06.tar.gz
cpython-6eea789fd2ab75c14b02e23713ad380498be0a06.tar.bz2
Disable encoding/decoding test, if unicode is disabled.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/string_tests.py39
1 files changed, 20 insertions, 19 deletions
diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py
index f2173a7..9f092b9 100644
--- a/Lib/test/string_tests.py
+++ b/Lib/test/string_tests.py
@@ -737,26 +737,27 @@ class MixinStrUserStringTest:
# Additional tests that only work with
# 8bit compatible object, i.e. str and UserString
- def test_encoding_decoding(self):
- codecs = [('rot13', 'uryyb jbeyq'),
- ('base64', 'aGVsbG8gd29ybGQ=\n'),
- ('hex', '68656c6c6f20776f726c64'),
- ('uu', 'begin 666 <data>\n+:&5L;&\\@=V]R;&0 \n \nend\n')]
- for encoding, data in codecs:
- self.checkequal(data, 'hello world', 'encode', encoding)
- self.checkequal('hello world', data, 'decode', encoding)
- # zlib is optional, so we make the test optional too...
- try:
- import zlib
- except ImportError:
- pass
- else:
- data = 'x\x9c\xcbH\xcd\xc9\xc9W(\xcf/\xcaI\x01\x00\x1a\x0b\x04]'
- self.checkequal(data, 'hello world', 'encode', 'zlib')
- self.checkequal('hello world', data, 'decode', 'zlib')
+ if test_support.have_unicode:
+ def test_encoding_decoding(self):
+ codecs = [('rot13', 'uryyb jbeyq'),
+ ('base64', 'aGVsbG8gd29ybGQ=\n'),
+ ('hex', '68656c6c6f20776f726c64'),
+ ('uu', 'begin 666 <data>\n+:&5L;&\\@=V]R;&0 \n \nend\n')]
+ for encoding, data in codecs:
+ self.checkequal(data, 'hello world', 'encode', encoding)
+ self.checkequal('hello world', data, 'decode', encoding)
+ # zlib is optional, so we make the test optional too...
+ try:
+ import zlib
+ except ImportError:
+ pass
+ else:
+ data = 'x\x9c\xcbH\xcd\xc9\xc9W(\xcf/\xcaI\x01\x00\x1a\x0b\x04]'
+ self.checkequal(data, 'hello world', 'encode', 'zlib')
+ self.checkequal('hello world', data, 'decode', 'zlib')
- self.checkraises(TypeError, 'xyz', 'decode', 42)
- self.checkraises(TypeError, 'xyz', 'encode', 42)
+ self.checkraises(TypeError, 'xyz', 'decode', 42)
+ self.checkraises(TypeError, 'xyz', 'encode', 42)
class MixinStrUnicodeTest: