RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 10:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

cephadm: Normalize mypy annotations

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

Signed-off-by: Kristoffer Grönlund <kgronlund@suse.com>
This commit is contained in:
Kristoffer Grönlund 2020-02-21 14:40:43 +01:00
parent 9a858cd2a8
commit 2e50b74e93
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cephadm/cephadm
View File

@ -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)