Add support for Python's long integers

mre · Jun 6, 2018 · e47ef32 · e47ef32
1 parent 642c7e1
commit e47ef32
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -338,11 +338,14 @@ impl<'a> TryFrom<HyperJsonValue<'a>> for PyObject {
     fn try_from(v: HyperJsonValue) -> Result<PyObject, PyErr> {
         match v.inner {
             serde_json::Value::Number(ref x) => {
-                // Unwrap should be safe here, since we checked for the correct
-                // type before
-                if x.is_i64() {
+                if x.is_u64() {
+                    // TODO: Do we need to use the use parse_int here as below?
+                    Ok(x.as_u64().unwrap().to_object(*v.py))
+                } else if x.is_i64() {
                     match v.parse_int {
                         Some(parser) => {
+                            // Unwrap should be safe here, since we checked for the correct
+                            // type before
                             let i = x.as_i64().unwrap();
                             Ok(parser.call1(*v.py, (i,))?)
                         }
@@ -351,6 +354,8 @@ impl<'a> TryFrom<HyperJsonValue<'a>> for PyObject {
                 } else {
                     match v.parse_float {
                         Some(parser) => {
+                            // Unwrap should be safe here, since we checked for the correct
+                            // type before
                             let f = x.as_f64().unwrap();
                             Ok(parser.call1(*v.py, (f,))?)
                         }

diff --git a/tests/test_ujson.py b/tests/test_ujson.py
@@ -236,20 +236,19 @@ def testEncodeUnicodeBMP(self):
     def testEncodeSymbols(self):
         s = '\u273f\u2661\u273f'  # ✿♡✿
         encoded = hyperjson.dumps(s)
-        encoded_json = hyperjson.dumps(s)
+        encoded_json = json.dumps(s)
         self.assertEqual(len(encoded), len(s) * 6 + 2)  # 6 characters + quotes
         self.assertEqual(encoded, encoded_json)
         decoded = hyperjson.loads(encoded)
         self.assertEqual(s, decoded)
 
-        # hyperjson outputs an UTF-8 encoded str object
         if six.PY3:
             encoded = hyperjson.dumps(s, ensure_ascii=False)
         else:
             encoded = hyperjson.dumps(s, ensure_ascii=False).decode("utf-8")
 
         # json outputs an unicode object
-        encoded_json = hyperjson.dumps(s, ensure_ascii=False)
+        encoded_json = json.dumps(s, ensure_ascii=False)
         self.assertEqual(len(encoded), len(s) + 2)  # original length + quotes
         self.assertEqual(encoded, encoded_json)
         decoded = hyperjson.loads(encoded)
@@ -519,7 +518,6 @@ def test_encodeLongConversion(self):
     def test_encodeLongUnsignedConversion(self):
         input = 18446744073709551615
         output = hyperjson.dumps(input)
-        print(output)
 
         self.assertEqual(input, hyperjson.loads(output))
         self.assertEqual(output, hyperjson.dumps(input))