mongodb/mongo-python-driver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PYTHON-996 - Adjust regex tests for python 3.5

Browse Source
This commit is contained in:
Bernie Hackett 2015-09-22 15:17:50 -07:00
parent b2a6fc61fd
commit 4bbe2133a1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/test_bson.py
View File

@ -731,14 +731,14 @@ class TestBSON(unittest.TestCase):
self.assertEqual(doc1, BSON(doc1_bson).decode())
# Valid Python regex, with flags.
re2 = re.compile('.*', re.I | re.L | re.M | re.S | re.U | re.X)
bson_re2 = Regex('.*', re.I | re.L | re.M | re.S | re.U | re.X)
re2 = re.compile(u('.*'), re.I | re.M | re.S | re.U | re.X)
bson_re2 = Regex(u('.*'), re.I | re.M | re.S | re.U | re.X)
doc2_with_re = {'r': re2}
doc2_with_bson_re = {'r': bson_re2}
doc2_bson = (
b"\x12\x00\x00\x00" # document length
b"\x0br\x00.*\x00ilmsux\x00" # r: regex
b"\x11\x00\x00\x00" # document length
b"\x0br\x00.*\x00imsux\x00" # r: regex
b"\x00") # document terminator
self.assertEqual(doc2_bson, BSON.encode(doc2_with_re))

6
test/test_json_util.py
View File

@ -113,10 +113,10 @@ class TestJsonUtil(unittest.TestCase):
self.assertEqual("a*b", res.pattern)
self.assertEqual(re.IGNORECASE, res.flags)
all_options = re.I|re.L|re.M|re.S|re.U|re.X
regex = re.compile("a*b", all_options)
unicode_options = re.I|re.M|re.S|re.U|re.X
regex = re.compile("a*b", unicode_options)
res = self.round_tripped({"r": regex})["r"]
self.assertEqual(all_options, res.flags)
self.assertEqual(unicode_options, res.flags)
# Some tools may not add $options if no flags are set.
res = json_util.loads('{"r": {"$regex": "a*b"}}')['r']