remove type ignores

apache · Sep 29, 2022 · ad122fc · ad122fc
1 parent 7ac5ca0
commit ad122fc
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 18 deletions.
diff --git a/superset/db_engine_specs/bigquery.py b/superset/db_engine_specs/bigquery.py
@@ -397,8 +397,11 @@ def get_parameters_from_uri(
 
     @classmethod
     def mask_encrypted_extra(cls, encrypted_extra: Optional[str]) -> Optional[str]:
+        if encrypted_extra is None:
+            return encrypted_extra
+
         try:
-            config = json.loads(encrypted_extra)  # type:ignore
+            config = json.loads(encrypted_extra)
         except (json.JSONDecodeError, TypeError):
             return encrypted_extra
 
@@ -416,9 +419,12 @@ def unmask_encrypted_extra(
         """
         Reuse ``private_key`` if available and unchanged.
         """
+        if old is None or new is None:
+            return new
+
         try:
-            old_config = json.loads(old)  # type:ignore
-            new_config = json.loads(new)  # type:ignore
+            old_config = json.loads(old)
+            new_config = json.loads(new)
         except (TypeError, json.JSONDecodeError):
             return new
 

diff --git a/superset/db_engine_specs/gsheets.py b/superset/db_engine_specs/gsheets.py
@@ -139,8 +139,11 @@ def get_parameters_from_uri(
 
     @classmethod
     def mask_encrypted_extra(cls, encrypted_extra: Optional[str]) -> Optional[str]:
+        if encrypted_extra is None:
+            return encrypted_extra
+
         try:
-            config = json.loads(encrypted_extra)  # type:ignore
+            config = json.loads(encrypted_extra)
         except (TypeError, json.JSONDecodeError):
             return encrypted_extra
 
@@ -158,9 +161,12 @@ def unmask_encrypted_extra(
         """
         Reuse ``private_key`` if available and unchanged.
         """
+        if old is None or new is None:
+            return new
+
         try:
-            old_config = json.loads(old)  # type:ignore
-            new_config = json.loads(new)  # type:ignore
+            old_config = json.loads(old)
+            new_config = json.loads(new)
         except (TypeError, json.JSONDecodeError):
             return new
 

diff --git a/superset/models/core.py b/superset/models/core.py
@@ -261,10 +261,12 @@ def parameters(self) -> Dict[str, Any]:
         masked_encrypted_extra = db_engine_spec.mask_encrypted_extra(
             self.encrypted_extra
         )
-        try:
-            encrypted_config = json.loads(masked_encrypted_extra)  # type: ignore
-        except (TypeError, json.JSONDecodeError):
-            encrypted_config = {}
+        encrypted_config = {}
+        if masked_encrypted_extra is not None:
+            try:
+                encrypted_config = json.loads(masked_encrypted_extra)
+            except (TypeError, json.JSONDecodeError):
+                pass
 
         try:
             # pylint: disable=useless-suppression

diff --git a/tests/unit_tests/db_engine_specs/test_bigquery.py b/tests/unit_tests/db_engine_specs/test_bigquery.py
@@ -186,7 +186,7 @@ def test_unmask_encrypted_extra() -> None:
         }
     )
 
-    assert json.loads(BigQueryEngineSpec.unmask_encrypted_extra(old, new)) == {  # type: ignore
+    assert json.loads(str(BigQueryEngineSpec.unmask_encrypted_extra(old, new))) == {
         "credentials_info": {
             "project_id": "yellow-unicorn-314419",
             "private_key": "SECRET",
@@ -210,7 +210,7 @@ def test_unmask_encrypted_extra_when_empty() -> None:
         }
     )
 
-    assert json.loads(BigQueryEngineSpec.unmask_encrypted_extra(old, new)) == {  # type: ignore
+    assert json.loads(str(BigQueryEngineSpec.unmask_encrypted_extra(old, new))) == {
         "credentials_info": {
             "project_id": "yellow-unicorn-314419",
             "private_key": "XXXXXXXXXX",

diff --git a/tests/unit_tests/db_engine_specs/test_gsheets.py b/tests/unit_tests/db_engine_specs/test_gsheets.py
@@ -228,9 +228,7 @@ def test_unmask_encrypted_extra() -> None:
         }
     )
 
-    assert json.loads(
-        GSheetsEngineSpec.unmask_encrypted_extra(old, new)  # type:ignore
-    ) == {
+    assert json.loads(str(GSheetsEngineSpec.unmask_encrypted_extra(old, new))) == {
         "service_account_info": {
             "project_id": "yellow-unicorn-314419",
             "private_key": "SECRET",
@@ -254,9 +252,7 @@ def test_unmask_encrypted_extra_when_old_is_none() -> None:
         }
     )
 
-    assert json.loads(
-        GSheetsEngineSpec.unmask_encrypted_extra(old, new)  # type:ignore
-    ) == {
+    assert json.loads(str(GSheetsEngineSpec.unmask_encrypted_extra(old, new))) == {
         "service_account_info": {
             "project_id": "yellow-unicorn-314419",
             "private_key": "XXXXXXXXXX",