Tidy type annotation up

as `None` is already defined through `Optional` — cf. https://docs.python.org/3/library/typing.html#typing.Optional Signed-off-by: Étienne Boisseau-Sierra <[email protected]>
dpgaspar · Feb 10, 2022 · ba7da50 · ba7da50
1 parent 79ccc4f
commit ba7da50
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/flask_appbuilder/cli.py b/flask_appbuilder/cli.py
@@ -152,7 +152,7 @@ def create_db():
 @click.option("--path", "-path", help="Specify filepath to export roles to")
 @click.option("--indent", help="Specify indent of generated JSON file")
 def export_roles(
-    path: Optional[str] = None, indent: Optional[Union[None, int, str]] = None
+    path: Optional[str] = None, indent: Optional[Union[int, str]] = None
 ) -> None:
     """Exports roles with permissions and view menus to JSON file"""
     # Cast negative numbers to int (as they're passed as str from CLI)

diff --git a/flask_appbuilder/security/manager.py b/flask_appbuilder/security/manager.py
@@ -2024,7 +2024,7 @@ def del_permission_role(self, role, perm_view):
         raise NotImplementedError
 
     def export_roles(
-        self, path: Optional[str] = None, indent: Optional[Union[None, int, str]] = None
+        self, path: Optional[str] = None, indent: Optional[Union[int, str]] = None
     ) -> None:
         """ Exports roles to JSON file. """
         raise NotImplementedError

diff --git a/flask_appbuilder/security/mongoengine/manager.py b/flask_appbuilder/security/mongoengine/manager.py
@@ -409,7 +409,7 @@ def del_permission_role(self, role, perm_view):
                 log.error(c.LOGMSG_ERR_SEC_DEL_PERMROLE.format(str(e)))
 
     def export_roles(
-        self, path: Optional[str] = None, indent: Optional[Union[None, int, str]] = None
+        self, path: Optional[str] = None, indent: Optional[Union[int, str]] = None
     ) -> None:
         """Exports roles to JSON file."""
         timestamp = datetime.now().strftime("%Y%m%dT%H%M%S")

diff --git a/flask_appbuilder/security/sqla/manager.py b/flask_appbuilder/security/sqla/manager.py
@@ -661,7 +661,7 @@ def del_permission_role(self, role, perm_view):
                 self.get_session.rollback()
 
     def export_roles(
-        self, path: Optional[str] = None, indent: Optional[Union[None, int, str]] = None
+        self, path: Optional[str] = None, indent: Optional[Union[int, str]] = None
     ) -> None:
         """ Exports roles to JSON file. """
         timestamp = datetime.now().strftime("%Y%m%dT%H%M%S")