elie/ssh-audit
1
0
Fork 0
mirror of https://github.com/jtesta/ssh-audit.git synced 2024-12-22 22:15:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Mypy 0.470. Add colorama stub. Fix identation.

Browse Source
This commit is contained in:
Andris Raugulis 2017-01-23 19:34:06 +02:00
parent c9443e6e06
commit 54b0960502
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ssh-audit.py
View File

@ -1267,16 +1267,17 @@ class SSH(object): # pylint: disable=too-few-public-methods
def maxlen(self): def maxlen(self):
# type: () -> int # type: () -> int
ml, maxlen = lambda l: max(len(i) for i in l), 0 ml, maxlen = lambda l: max(len(i) for i in l), 0
# type: Callable[[Sequence[text_type]], int], int
if self.ssh1kex is not None: if self.ssh1kex is not None:
maxlen = max(ml(self.ssh1kex.supported_ciphers), maxlen = max(ml(self.ssh1kex.supported_ciphers),
ml(self.ssh1kex.supported_authentications), ml(self.ssh1kex.supported_authentications),
maxlen) maxlen)
if self.ssh2kex is not None: if self.ssh2kex is not None:
maxlen = max(ml(self.ssh2kex.kex_algorithms), maxlen = max(ml(self.ssh2kex.kex_algorithms),
ml(self.ssh2kex.key_algorithms), ml(self.ssh2kex.key_algorithms),
ml(self.ssh2kex.server.encryption), ml(self.ssh2kex.server.encryption),
ml(self.ssh2kex.server.mac), ml(self.ssh2kex.server.mac),
maxlen) maxlen)
return maxlen return maxlen
def get_ssh_timeframe(self, for_server=True): def get_ssh_timeframe(self, for_server=True):
@ -1298,8 +1299,8 @@ class SSH(object): # pylint: disable=too-few-public-methods
# type: (Optional[SSH.Software], bool) -> Tuple[Optional[SSH.Software], Dict[int, Dict[str, Dict[str, Dict[str, int]]]]] # type: (Optional[SSH.Software], bool) -> Tuple[Optional[SSH.Software], Dict[int, Dict[str, Dict[str, Dict[str, int]]]]]
# pylint: disable=too-many-locals,too-many-statements # pylint: disable=too-many-locals,too-many-statements
vproducts = [SSH.Product.OpenSSH, vproducts = [SSH.Product.OpenSSH,
SSH.Product.DropbearSSH, SSH.Product.DropbearSSH,
SSH.Product.LibSSH] SSH.Product.LibSSH]
if software is not None: if software is not None:
if software.product not in vproducts: if software.product not in vproducts:
software = None software = None

2
test/mypy-py2.sh
View File

@ -7,4 +7,4 @@ if [ $? -ne 0 ]; then
fi fi
_htmldir="${_cdir}/../html/mypy-py2" _htmldir="${_cdir}/../html/mypy-py2"
mkdir -p "${_htmldir}" mkdir -p "${_htmldir}"
mypy --python-version 2.7 --strict-optional --config-file "${_cdir}/mypy.ini" --html-report "${_htmldir}" "${_cdir}/../ssh-audit.py" env MYPYPATH="${_cdir}/stubs/" mypy --python-version 2.7 --strict-optional --config-file "${_cdir}/mypy.ini" --html-report "${_htmldir}" "${_cdir}/../ssh-audit.py"

2
test/mypy-py3.sh
View File

@ -7,4 +7,4 @@ if [ $? -ne 0 ]; then
fi fi
_htmldir="${_cdir}/../html/mypy-py3" _htmldir="${_cdir}/../html/mypy-py3"
mkdir -p "${_htmldir}" mkdir -p "${_htmldir}"
mypy --python-version 3.5 --strict-optional --config-file "${_cdir}/mypy.ini" --html-report "${_htmldir}" "${_cdir}/../ssh-audit.py" env MYPYPATH="${_cdir}/stubs/" mypy --python-version 3.5 --strict-optional --config-file "${_cdir}/mypy.ini" --html-report "${_htmldir}" "${_cdir}/../ssh-audit.py"

4
test/mypy.ini
View File

@ -1,9 +1,9 @@
[mypy] [mypy]
silent_imports = True ignore_missing_imports = False
follow_imports = error
disallow_untyped_calls = True disallow_untyped_calls = True
disallow_untyped_defs = True disallow_untyped_defs = True
check_untyped_defs = True check_untyped_defs = True
disallow-subclassing-any = True disallow-subclassing-any = True
warn-incomplete-stub = True warn-incomplete-stub = True
warn-redundant-casts = True warn-redundant-casts = True

6
test/stubs/colorama.pyi Normal file
View File

@ -0,0 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
from typing import Optional
def init(autoreset: bool = False, convert: Optional[bool] = None, strip: Optional[bool] = None, wrap: bool = True) -> None: ...