Revert "Workaround for object_type in py>=0.32.0 (#656)" (#665)

This reverts commit 76ab094.
TileDB-Inc · Oct 8, 2024 · 3e9ff2b · 3e9ff2b
1 parent 3b957a7
commit 3e9ff2b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/tiledb/cloud/bioimg/ingestion.py b/src/tiledb/cloud/bioimg/ingestion.py
@@ -274,7 +274,7 @@ def register_dataset_udf(
                     logger.debug("Object type of %s : %s", tiledb_uri, object_type)
                     if object_type == "group":
                         found = True
-                    elif object_type is not None or object_type != "None":
+                    elif object_type is not None:
                         raise ValueError(
                             f"Another object is already registered at '{tiledb_uri}'."
                         )

diff --git a/src/tiledb/cloud/geospatial/ingestion.py b/src/tiledb/cloud/geospatial/ingestion.py
@@ -942,7 +942,7 @@ def register_dataset_udf(
             object_type = tiledb.object_type(tiledb_uri)
             if object_type == "array":
                 found = True
-            elif object_type is not None or object_type != "None":
+            elif object_type is not None:
                 raise ValueError(
                     f"Another object is already registered at '{tiledb_uri}'."
                 )

diff --git a/src/tiledb/cloud/soma/ingest.py b/src/tiledb/cloud/soma/ingest.py
@@ -47,7 +47,7 @@ def register_dataset_udf(
             object_type = tiledb.object_type(tiledb_uri)
             if object_type == "group":
                 found = True
-            elif object_type is not None or object_type != "None":
+            elif object_type is not None:
                 raise ValueError(
                     f"Another object is already registered at '{tiledb_uri}'."
                 )

diff --git a/src/tiledb/cloud/vcf/ingestion.py b/src/tiledb/cloud/vcf/ingestion.py
@@ -256,7 +256,7 @@ def register_dataset_udf(
             object_type = tiledb.object_type(tiledb_uri)
             if object_type == "group":
                 found = True
-            elif object_type is not None or object_type != "None":
+            elif object_type is not None:
                 raise ValueError(
                     f"Another object is already registered at '{tiledb_uri}'."
                 )