Skip to content

Commit

Permalink
Remove python 2 six compat from ujson tests
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianeboyd committed Jul 18, 2023
1 parent 2f99b03 commit 7e904fb
Showing 1 changed file with 8 additions and 31 deletions.
39 changes: 8 additions & 31 deletions srsly/tests/ujson/test_ujson.py
@@ -1,9 +1,3 @@
from __future__ import print_function, unicode_literals
import six
from six.moves import range, zip

import calendar
import functools
import ctypes
import decimal
import json
Expand Down Expand Up @@ -197,11 +191,7 @@ def testEncodeUnicodeBMP(self):
decoded = ujson.loads(encoded)
self.assertEqual(s, decoded)

# ujson outputs an UTF-8 encoded str object
if six.PY3:
encoded = ujson.dumps(s, ensure_ascii=False)
else:
encoded = ujson.dumps(s, ensure_ascii=False).decode("utf-8")
encoded = ujson.dumps(s, ensure_ascii=False)

# json outputs an unicode object
encoded_json = json.dumps(s, ensure_ascii=False)
Expand All @@ -219,11 +209,7 @@ def testEncodeSymbols(self):
decoded = ujson.loads(encoded)
self.assertEqual(s, decoded)

# ujson outputs an UTF-8 encoded str object
if six.PY3:
encoded = ujson.dumps(s, ensure_ascii=False)
else:
encoded = ujson.dumps(s, ensure_ascii=False).decode("utf-8")
encoded = ujson.dumps(s, ensure_ascii=False)

# json outputs an unicode object
encoded_json = json.dumps(s, ensure_ascii=False)
Expand Down Expand Up @@ -301,8 +287,7 @@ def test_encodeFalseConversion(self):

def test_encodeToUTF8(self):
input = b"\xe6\x97\xa5\xd1\x88"
if six.PY3:
input = input.decode('utf-8')
input = input.decode('utf-8')
enc = ujson.encode(input, ensure_ascii=False)
dec = ujson.decode(enc)
self.assertEqual(enc, json.dumps(input, ensure_ascii=False))
Expand Down Expand Up @@ -531,7 +516,7 @@ def test_decodeNumericIntExpeMinus(self):
self.assertEqual(output, json.loads(input))

def test_dumpToFile(self):
f = six.StringIO()
f = StringIO()
ujson.dump([1, 2, 3], f)
self.assertEqual("[1,2,3]", f.getvalue())

Expand All @@ -551,7 +536,7 @@ def test_dumpFileArgsError(self):
self.assertRaises(TypeError, ujson.dump, [], '')

def test_loadFile(self):
f = six.StringIO("[1,2,3,4]")
f = StringIO("[1,2,3,4]")
self.assertEqual([1, 2, 3, 4], ujson.load(f))

def test_loadFileLikeObject(self):
Expand Down Expand Up @@ -587,21 +572,14 @@ def test_decodeNumberWith32bitSignBit(self):

def test_encodeBigEscape(self):
for x in range(10):
if six.PY3:
base = '\u00e5'.encode('utf-8')
else:
base = "\xc3\xa5"
base = '\u00e5'.encode('utf-8')
input = base * 1024 * 1024 * 2
ujson.encode(input)

def test_decodeBigEscape(self):
for x in range(10):
if six.PY3:
base = '\u00e5'.encode('utf-8')
quote = "\"".encode()
else:
base = "\xc3\xa5"
quote = "\""
base = '\u00e5'.encode('utf-8')
quote = "\"".encode()
input = quote + (base * 1024 * 1024 * 2) + quote
ujson.decode(input)

Expand Down Expand Up @@ -799,7 +777,6 @@ def test_WriteArrayOfSymbolsFromList(self):
def test_WriteArrayOfSymbolsFromTuple(self):
self.assertEqual("[true,false,null]", ujson.dumps((True, False, None)))

@unittest.skipIf(not six.PY3, "Only raises on Python 3")
def test_encodingInvalidUnicodeCharacter(self):
s = "\udc7f"
self.assertRaises(UnicodeEncodeError, ujson.dumps, s)
Expand Down

0 comments on commit 7e904fb

Please sign in to comment.