cephadm: Normalize mypy annotations

Try to use `# type: ...` consistently.

Signed-off-by: Kristoffer Grönlund <kgronlund@suse.com>

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 56a978c10640558e6bf3899425d76f9018c9915f..afe33a7128085523e0a92ea1d7fd01d8fc4e0e8e 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -515,7 +515,7 @@ def call_throws(command, **kwargs):
 
 
 def call_timeout(command, timeout):
-    #type (List[str], int) -> int
+    # type: (List[str], int) -> int
 
     logger.debug('Running command (timeout=%s): %s'
             % (timeout, ' '.join(command)))
@@ -526,7 +526,7 @@ def call_timeout(command, timeout):
         raise TimeoutExpired(msg)
 
     def call_timeout_py2(command, timeout):
-        #type (List[str], int) -> int
+        # type: (List[str], int) -> int
         proc = subprocess.Popen(command)
         thread = Thread(target=proc.wait)
         thread.start()
@@ -538,7 +538,7 @@ def call_timeout(command, timeout):
         return proc.returncode
 
     def call_timeout_py3(command, timeout):
-        #type (List[str], int) -> int
+        # type: (List[str], int) -> int
         try:
             return subprocess.call(command, timeout=timeout)
         except subprocess.TimeoutExpired as e:
@@ -555,7 +555,7 @@ def call_timeout(command, timeout):
 ##################################
 
 def is_available(what, func):
-    # type (str, func, Optional[int]) -> func
+    # type: (str, func, Optional[int]) -> func
     """
     Wait for a service to become available
 
@@ -656,6 +656,7 @@ def generate_password():
                    for i in range(10))
 
 def normalize_container_id(i):
+    # type: (str) -> str
     # docker adds the sha256: prefix, but AFAICS both
     # docker (18.09.7 in bionic at least) and podman
     # both always use sha256, so leave off the prefix
@@ -853,7 +854,7 @@ def find_program(filename):
     return name
 
 def get_unit_name(fsid, daemon_type, daemon_id=None):
-    # type (str, str, Optional[Union[int, str]]) -> str
+    # type: (str, str, Optional[Union[int, str]]) -> str
     # accept either name or type + id
     if daemon_id is not None:
         return 'ceph-%s@%s.%s' % (fsid, daemon_type, daemon_id)