mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 13:41:24 +00:00 
			
		
		
		
	port simplejson upgrade from the trunk #4136
json also now works only with unicode strings Patch by Antoine Pitrou; updated by me
This commit is contained in:
		
							parent
							
								
									7255f18556
								
							
						
					
					
						commit
						c6b607d4a9
					
				
					 15 changed files with 2011 additions and 959 deletions
				
			
		|  | @ -3,22 +3,20 @@ | |||
| import json.encoder | ||||
| 
 | ||||
| CASES = [ | ||||
|     ('/\\"\ucafe\ubabe\uab98\ufcde\ubcda\uef4a\x08\x0c\n\r\t`1~!@#$%^&*()_+-=[]{}|;:\',./<>?', b'"/\\\\\\"\\ucafe\\ubabe\\uab98\\ufcde\\ubcda\\uef4a\\b\\f\\n\\r\\t`1~!@#$%^&*()_+-=[]{}|;:\',./<>?"'), | ||||
|     ('\u0123\u4567\u89ab\ucdef\uabcd\uef4a', b'"\\u0123\\u4567\\u89ab\\ucdef\\uabcd\\uef4a"'), | ||||
|     ('controls', b'"controls"'), | ||||
|     ('\x08\x0c\n\r\t', b'"\\b\\f\\n\\r\\t"'), | ||||
|     ('{"object with 1 member":["array with 1 element"]}', b'"{\\"object with 1 member\\":[\\"array with 1 element\\"]}"'), | ||||
|     (' s p a c e d ', b'" s p a c e d "'), | ||||
|     ('\U0001d120', b'"\\ud834\\udd20"'), | ||||
|     ('\u03b1\u03a9', b'"\\u03b1\\u03a9"'), | ||||
|     (b'\xce\xb1\xce\xa9', b'"\\u03b1\\u03a9"'), | ||||
|     ('\u03b1\u03a9', b'"\\u03b1\\u03a9"'), | ||||
|     (b'\xce\xb1\xce\xa9', b'"\\u03b1\\u03a9"'), | ||||
|     ('\u03b1\u03a9', b'"\\u03b1\\u03a9"'), | ||||
|     ('\u03b1\u03a9', b'"\\u03b1\\u03a9"'), | ||||
|     ("`1~!@#$%^&*()_+-={':[,]}|;.</>?", b'"`1~!@#$%^&*()_+-={\':[,]}|;.</>?"'), | ||||
|     ('\x08\x0c\n\r\t', b'"\\b\\f\\n\\r\\t"'), | ||||
|     ('\u0123\u4567\u89ab\ucdef\uabcd\uef4a', b'"\\u0123\\u4567\\u89ab\\ucdef\\uabcd\\uef4a"'), | ||||
|     ('/\\"\ucafe\ubabe\uab98\ufcde\ubcda\uef4a\x08\x0c\n\r\t`1~!@#$%^&*()_+-=[]{}|;:\',./<>?', '"/\\\\\\"\\ucafe\\ubabe\\uab98\\ufcde\\ubcda\\uef4a\\b\\f\\n\\r\\t`1~!@#$%^&*()_+-=[]{}|;:\',./<>?"'), | ||||
|     ('\u0123\u4567\u89ab\ucdef\uabcd\uef4a', '"\\u0123\\u4567\\u89ab\\ucdef\\uabcd\\uef4a"'), | ||||
|     ('controls', '"controls"'), | ||||
|     ('\x08\x0c\n\r\t', '"\\b\\f\\n\\r\\t"'), | ||||
|     ('{"object with 1 member":["array with 1 element"]}', '"{\\"object with 1 member\\":[\\"array with 1 element\\"]}"'), | ||||
|     (' s p a c e d ', '" s p a c e d "'), | ||||
|     ('\U0001d120', '"\\ud834\\udd20"'), | ||||
|     ('\u03b1\u03a9', '"\\u03b1\\u03a9"'), | ||||
|     ('\u03b1\u03a9', '"\\u03b1\\u03a9"'), | ||||
|     ('\u03b1\u03a9', '"\\u03b1\\u03a9"'), | ||||
|     ('\u03b1\u03a9', '"\\u03b1\\u03a9"'), | ||||
|     ("`1~!@#$%^&*()_+-={':[,]}|;.</>?", '"`1~!@#$%^&*()_+-={\':[,]}|;.</>?"'), | ||||
|     ('\x08\x0c\n\r\t', '"\\b\\f\\n\\r\\t"'), | ||||
|     ('\u0123\u4567\u89ab\ucdef\uabcd\uef4a', '"\\u0123\\u4567\\u89ab\\ucdef\\uabcd\\uef4a"'), | ||||
| ] | ||||
| 
 | ||||
| class TestEncodeBaseStringAscii(TestCase): | ||||
|  | @ -26,12 +24,14 @@ def test_py_encode_basestring_ascii(self): | |||
|         self._test_encode_basestring_ascii(json.encoder.py_encode_basestring_ascii) | ||||
| 
 | ||||
|     def test_c_encode_basestring_ascii(self): | ||||
|         if json.encoder.c_encode_basestring_ascii is not None: | ||||
|             self._test_encode_basestring_ascii(json.encoder.c_encode_basestring_ascii) | ||||
|         if not json.encoder.c_encode_basestring_ascii: | ||||
|             return | ||||
|         self._test_encode_basestring_ascii(json.encoder.c_encode_basestring_ascii) | ||||
| 
 | ||||
|     def _test_encode_basestring_ascii(self, encode_basestring_ascii): | ||||
|         fname = encode_basestring_ascii.__name__ | ||||
|         for input_string, expect in CASES: | ||||
|             result = encode_basestring_ascii(input_string) | ||||
|             result = result.encode("ascii") | ||||
|             self.assertEquals(result, expect) | ||||
|             self.assertEquals(result, expect, | ||||
|                 '{0!r} != {1!r} for {2}({3!r})'.format( | ||||
|                     result, expect, fname, input_string)) | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Benjamin Peterson
						Benjamin Peterson