Update libbson to 1.6.2

Author: ShaneHarvey

libbson

@@ -34,7 +34,7 @@
     except Exception:
         description = ""
 
-tests_require = ["pymongo"]
+tests_require = ["pymongo>=3.4.0"]
 if sys.version_info[:2] == (2, 6):
     tests_require.append("unittest2 >= 0.5.1")
     test_suite = "unittest2.collector"
@@ -75,7 +75,7 @@
             include_dirs=["src",
                           "src/bson",
                           "libbson/src",
-                          "libbson/src/yajl",
+                          "libbson/src/jsonsl",
                           "libbson/src/bson"],
             define_macros=[("BSON_COMPILATION", 1)],
             libraries=["ws2_32"] if sys.platform == "win32" else []

setup.py

@@ -157,13 +157,4 @@
 # undef BSON_HAVE_DECIMAL128
 #endif
 
-
-/*
- * Define to 1 to support experimental future BSON or MongoDB features.
- */
-#define BSON_EXPERIMENTAL_FEATURES 1
-#if BSON_EXPERIMENTAL_FEATURES != 1
-# undef BSON_EXPERIMENTAL_FEATURES
-#endif
-
 #endif /* BSON_CONFIG_H */

src/bson/bson-config.h

@@ -37,15 +37,15 @@
  *
  * BSON minor version component (e.g. 2 if %BSON_VERSION is 1.2.3)
  */
-#define BSON_MINOR_VERSION (4)
+#define BSON_MINOR_VERSION (6)
 
 
 /**
  * BSON_MICRO_VERSION:
  *
  * BSON micro version component (e.g. 3 if %BSON_VERSION is 1.2.3)
  */
-#define BSON_MICRO_VERSION (0)
+#define BSON_MICRO_VERSION (2)
 
 
 /**
@@ -60,7 +60,7 @@
  *
  * BSON version.
  */
-#define BSON_VERSION (1.4.0)
+#define BSON_VERSION (1.6.2)
 
 
 /**
@@ -69,7 +69,7 @@
  * BSON version, encoded as a string, useful for printing and
  * concatenation.
  */
-#define BSON_VERSION_S "1.4.0"
+#define BSON_VERSION_S "1.6.2"
 
 
 /**

src/bson/bson-version.h

@@ -0,0 +1,24 @@
+# Copyright 2017 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import sys
+
+if sys.version_info[0] == 2:
+    from StringIO import StringIO
+else:
+    from io import StringIO
+
+if sys.version_info[:2] == (2, 6):
+    import unittest2 as unittest
+else:
+    import unittest

test/__init__.py

@@ -19,18 +19,6 @@
 import sys
 import uuid
 
-sys.path.insert(0, "")
-
-if sys.version_info[0] == 2:
-    from StringIO import StringIO
-else:
-    from io import StringIO
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
-
 import bson
 from bson import json_util, EPOCH_AWARE
 from bson.binary import Binary, MD5_SUBTYPE, USER_DEFINED_SUBTYPE
@@ -46,8 +34,12 @@
 from bson.timestamp import Timestamp
 from bson.tz_util import utc
 
+sys.path.insert(0, "")
+
 import bsonjs
 
+from test import StringIO, unittest
+
 
 def to_object(bson_bytes):
     """Return deserialized object from BSON bytes"""
@@ -80,8 +72,11 @@ def round_trip(self, doc):
         bson_bytes = to_bson(doc)
         self.assertEqual(bson_bytes, bsonjs.loads(bsonjs.dumps(bson_bytes)))
         # Check compatibility between bsonjs and json_util
-        self.assertEqual(doc, json_util.loads(bsonjs.dumps(bson_bytes)))
-        self.assertEqual(bson_bytes, bsonjs.loads(json_util.dumps(doc)))
+        self.assertEqual(doc, json_util.loads(
+            bsonjs.dumps(bson_bytes),
+            json_options=json_util.STRICT_JSON_OPTIONS))
+        self.assertEqual(bson_bytes, bsonjs.loads(json_util.dumps(
+            doc, json_options=json_util.STRICT_JSON_OPTIONS)))
 
     def test_basic(self):
         self.round_trip({"hello": "world"})
@@ -173,7 +168,6 @@ def test_timestamp(self):
         rtdct = bsonjs_loads(res)
         self.assertEqual(dct, rtdct)
 
-    @unittest.skip("PYTHON-1103")
     def test_uuid(self):
         self.round_trip({"uuid":
                          uuid.UUID("f47ac10b-58cc-4372-a567-0e02b2c3d479")})
@@ -203,15 +197,15 @@ def test_binary(self):
         self.assertRaises(ValueError, bsonjs.loads,
                           '{"a": {"$binary": "invalid", "$type": "80"}}')
 
-    @unittest.skip("CDRIVER-1335")
     def test_code(self):
         self.round_trip({"code": Code("function x() { return 1; }")})
         code = {"code": Code("return z", z=2)}
         self.round_trip(code)
 
         # Check order.
-        self.assertEqual('{"$code": "return z", "$scope": {"z": 2}}',
-                         bsonjs_dumps(code))
+        self.assertEqual(
+            '{ "code" : { "$code" : "return z", "$scope" : { "z" : 2 } } }',
+            bsonjs_dumps(code))
 
     def test_undefined(self):
         json_str = '{"name": {"$undefined": true}}'
@@ -229,14 +223,12 @@ def test_numberlong(self):
         self.assertRaises(ValueError, bsonjs.loads,
                           '{"a": {"$numberLong": "not-a-number"}}')
 
-    @unittest.skip("CDRIVER-1366")
     def test_load_mongodb_extended_type_at_top_level(self):
         self.assertRaises(ValueError, bsonjs.loads,
                           '{"$numberLong": "42"}')
         self.assertRaises(ValueError, bsonjs.loads,
                           '{"$numberLong": "42", "a": 1}')
-        self.assertRaises(ValueError, bsonjs.loads,
-                          '{"a": 1, "$numberLong": "42"}')
+        _ = bsonjs.loads('{"a": 1, "$numberLong": "42"}')
 
     def test_dumps_multiple_bson_documents(self):
         json_str = '{ "test" : "me" }'