PYTHON-996 - Adjust regex tests for python 3.5

behackett · behackett · commit 4bbe2133a14d · 2015-09-22T15:17:50.000-07:00
diff --git a/test/test_bson.py b/test/test_bson.py
@@ -731,14 +731,14 @@ def test_bson_regex(self):
         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))
diff --git a/test/test_json_util.py b/test/test_json_util.py
@@ -113,10 +113,10 @@ def test_regex(self):
             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']
