Merge pull request #43 from davidlatwe/fix-init-bson

Fix init bson

Author: davidlatwe

README.md

@@ -33,7 +33,9 @@ And this project is testing against to:
 pip install montydb
 ```
 
-* optional, to use `bson` in operation (`pymongo` will be installed)
+* optional, to use *real* `bson` in operation (`pymongo` will be installed)
+
+    *For minimum requirements, `montydb` ships with it's own fork of `ObjectId` in `montydb.types`, so you may ignore this option if `ObjectId` is all you need from `bson`*
 
     ```
     pip install montydb[bson]
@@ -72,7 +74,7 @@ set_storage(
     repository="/db/repo",  # dir path for database to live on disk, default is {cwd}
     storage="flatfile",     # storage name, default "flatfile"
     mongo_version="4.0",    # try matching behavior with this mongodb version
-    use_bson=False,         # default None, and will try importing pymongo if None
+    use_bson=False,         # default None, and will import pymongo's bson if None or True
 
     # any other kwargs are storage engine settings
     #

montydb/_version.py

@@ -1,5 +1,5 @@
 
-version_info = (2, 3, 7)
+version_info = (2, 3, 8)
 __version__ = "%i.%i.%i" % version_info
 
 

montydb/base.py

@@ -28,7 +28,7 @@
     iteritems,
     integer_types,
     string_types,
-    bson_ as bson,
+    bson,
 )
 
 ASCENDING = 1

montydb/collection.py

@@ -17,7 +17,7 @@
 from .engine.update import Updator
 from .types import (
     abc,
-    bson_ as bson,
+    bson,
     string_types,
     is_duckument_type,
     Counter,

montydb/configure.py

@@ -25,7 +25,7 @@
 _session = {}
 _session_default = {
     "mongo_version": "4.2",
-    "use_bson": False,
+    "use_bson": None,
 }
 # TODO:
 #   The mongo version compating may fail if calling `set_storage()` multiple
@@ -194,13 +194,13 @@ def set_storage(
         mongo_version (str, optional): Which mongodb version's behavior should
             montydb try to match with. Default "4.2", other versions are "3.6",
             "4.0".
-        use_bson (bool, optional): Use bson module. Default `False`.
+        use_bson (bool, optional): Use bson module. Default `None`.
 
     keyword args:
         Other keyword args will be parsed as storage config options.
 
     """
-    from .types import bson_ as bson
+    from .types import bson
 
     storage = storage or DEFAULT_STORAGE
 
@@ -267,20 +267,26 @@ def provide_storage(repository):
 
 
 def _bson_init(use_bson):
-    from .types import bson_ as bson
+    from .types import bson
 
-    if bson.bson_used and not use_bson:
+    if bson.bson_used is None:
+        bson.init(use_bson)
+
+    elif bson.bson_used and not use_bson:
         raise ConfigurationError(
             "montydb has been config to use BSON and "
             "cannot be changed in current session."
         )
+
     elif not bson.bson_used and use_bson:
         raise ConfigurationError(
             "montydb has been config to opt-out BSON and "
             "cannot be changed in current session."
         )
+
     else:
-        bson.init(use_bson)
+        # bson.bson_used == use_bson
+        pass
 
 
 def _mongo_compat(version):

montydb/cursor.py

@@ -6,10 +6,10 @@
 from .engine.queries import QueryFilter, ordering
 from .engine.project import Projector
 from .types import (
+    bson,
     RE_PATTERN_TYPE,
     iteritems,
     integer_types,
-    bson_ as bson,
 )
 from .base import (
     validate_boolean,

montydb/engine/queries.py

@@ -12,10 +12,10 @@
     _cmp_decimal,
 )
 from ..types import (
+    bson,
     RE_PATTERN_TYPE,
     integer_types,
     string_types,
-    bson_ as bson,
     is_duckument_type,
     is_integer_type,
     is_pattern_type,

montydb/engine/update.py

@@ -7,7 +7,7 @@
 from .weighted import Weighted, _cmp_decimal
 from .queries import QueryFilter, ordering
 from ..types import (
-    bson_ as bson,
+    bson,
     string_types,
     is_numeric_type,
     is_duckument_type,

montydb/engine/weighted.py

@@ -3,9 +3,9 @@
 from collections import Mapping
 
 from ..types import (
+    bson,
     integer_types,
     string_types,
-    bson_ as bson,
 
     RE_PATTERN_TYPE,
     re_int_flag_to_str,

montydb/errors.py

@@ -2,7 +2,7 @@
 
 def init_bson_err():
     import sys
-    from .types import bson_ as bson
+    from .types import bson
     this = sys.modules[__name__]
 
     class DocumentTooLarge(bson.InvalidDocument):