Commit 55091f1

juliusgeoShaneHarvey

authored and

committed

PYTHON-3028 $regex as a field name does not allow for non-string values (#807)

(cherry picked from commit 70f7fe7)

1 parent f7d757d commit 55091f1Copy full SHA for 55091f1

File tree

+10

-1

lines changed

+10

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,7 @@ def object_hook(dct, json_options=DEFAULT_JSON_OPTIONS):`
`505`	`505`	`def _parse_legacy_regex(doc):`
`506`	`506`	`pattern = doc["$regex"]`
`507`	`507`	`# Check if this is the $regex query operator.`
`508`		`- if isinstance(pattern, Regex):`
	`508`	`+ if notisinstance(pattern, (text_type, bytes)):`
`509`	`509`	`return doc`
`510`	`510`	`flags = 0`
`511`	`511`	`# PyMongo always adds $options but some other tools may not.`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,15 @@ def test_regex(self):`
`262`	`262`	`'{"$regex": ".*", "$options": "mx"}',`
`263`	`263`	`json_util.dumps(re.compile(b'.*', re.M \| re.X)))`
`264`	`264`
	`265`	`+ def test_regex_validation(self):`
	`266`	`+ non_str_types = [10, {}, []]`
	`267`	`+ docs = [{"$regex": i} for i in non_str_types]`
	`268`	`+ for doc in docs:`
	`269`	`+ self.assertEqual(doc, json_util.loads(json.dumps(doc)))`
	`270`	`+`
	`271`	`+ doc = {"$regex": ""}`
	`272`	`+ self.assertIsInstance(json_util.loads(json.dumps(doc)), Regex)`
	`273`	`+`
`265`	`274`	`def test_minkey(self):`
`266`	`275`	`self.round_trip({"m": MinKey()})`
`267`	`276`

Comments

(0)