1
0
mirror of synced 2024-11-22 01:04:23 +01:00

Revert "Simplify a bit the typing annotations of ./mat2"

This reverts commit 29057d6cdf.
This commit is contained in:
jvoisin 2023-01-14 15:35:21 +01:00
parent 8d7230ba16
commit e8b38f1101

11
mat2
View File

@ -2,6 +2,7 @@
import os import os
import shutil import shutil
from typing import List, Union, Set
import sys import sys
import mimetypes import mimetypes
import argparse import argparse
@ -35,7 +36,7 @@ def __check_file(filename: str, mode: int = os.R_OK) -> bool:
__print_without_chars("[-] %s is not a regular file." % filename) __print_without_chars("[-] %s is not a regular file." % filename)
return False return False
elif not os.access(filename, mode): elif not os.access(filename, mode):
mode_str = [] # type: list[str] mode_str = [] # type: List[str]
if mode & os.R_OK: if mode & os.R_OK:
mode_str += 'readable' mode_str += 'readable'
if mode & os.W_OK: if mode & os.W_OK:
@ -151,10 +152,10 @@ def clean_meta(filename: str, is_lightweight: bool, inplace: bool, sandbox: bool
def show_parsers(): def show_parsers():
print('[+] Supported formats:') print('[+] Supported formats:')
formats = set() # set[str] formats = set() # Set[str]
for parser in parser_factory._get_parsers(): # type: ignore for parser in parser_factory._get_parsers(): # type: ignore
for mtype in parser.mimetypes: for mtype in parser.mimetypes:
extensions = set() # set[str] extensions = set() # Set[str]
for extension in mimetypes.guess_all_extensions(mtype): for extension in mimetypes.guess_all_extensions(mtype):
if extension not in UNSUPPORTED_EXTENSIONS: if extension not in UNSUPPORTED_EXTENSIONS:
extensions.add(extension) extensions.add(extension)
@ -166,8 +167,8 @@ def show_parsers():
print('\n'.join(sorted(formats))) print('\n'.join(sorted(formats)))
def __get_files_recursively(files: list[str]) -> list[str]: def __get_files_recursively(files: List[str]) -> List[str]:
ret = set() # type: set[str] ret = set() # type: Set[str]
for f in files: for f in files:
if os.path.isdir(f): if os.path.isdir(f):
for path, _, _files in os.walk(f): for path, _, _files in os.walk(f):