PXP-10952 Fix allow_nulls() for oneOf/anyOf (#85)

uc-cdis · May 30, 2023 · 5ee2b6a · 5ee2b6a
1 parent 5cb4228
commit 5ee2b6a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dictionaryutils/__init__.py b/dictionaryutils/__init__.py
@@ -278,7 +278,7 @@ def allow_nulls(self):
                     if not isinstance(prop["enum"], list):
                         prop["enum"] = [prop["enum"]]
                     prop["enum"].append(None)
-                elif "anyOf" in prop:
+                elif "anyOf" in prop and {"type": "null"} not in prop["anyOf"]:
                     prop["anyOf"].append({"type": "null"})
-                elif "oneOf" in prop:
+                elif "oneOf" in prop and {"type": "null"} not in prop["oneOf"]:
                     prop["oneOf"].append({"type": "null"})
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dictionaryutils"
-version = "3.4.5"
+version = "3.4.6"
 description = "Python wrapper and metaschema for datadictionary."
 authors = ["CTDS UChicago <[email protected]>"]
 license = "Apache-2.0"