Fix type annotations

This fixes annotations and reworks the argument parser to resolve
type errors.

Author: elopez

solc_select/__main__.py

@@ -29,7 +29,8 @@
 def solc_select() -> None:
     parser = argparse.ArgumentParser()
     subparsers = parser.add_subparsers(
-        help="Allows users to install and quickly switch between Solidity compiler versions"
+        help="Allows users to install and quickly switch between Solidity compiler versions",
+        dest="command",
     )
     parser_install = subparsers.add_parser(
         "install", help="list and install available solc versions"
@@ -51,22 +52,22 @@ def solc_select() -> None:
     parser_use = subparsers.add_parser("upgrade", help="upgrades solc-select")
     parser_use.add_argument(UPGRADE, nargs="*", help=argparse.SUPPRESS)
 
-    args = vars(parser.parse_args())
+    args = parser.parse_args()
 
-    if args.get(INSTALL_VERSIONS) is not None:
-        versions = args.get(INSTALL_VERSIONS)
+    if args.command == "install":
+        versions = args.INSTALL_VERSIONS
         if not versions:
             print("Available versions to install:")
             for version in get_installable_versions():
                 print(version)
         else:
-            status = install_artifacts(args.get(INSTALL_VERSIONS))
+            status = install_artifacts(versions)
             sys.exit(0 if status else 1)
 
-    elif args.get(USE_VERSION) is not None:
-        switch_global_version(args.get(USE_VERSION), args.get("always_install"), silent=False)
+    elif args.command == "use":
+        switch_global_version(args.USE_VERSION, args.always_install, silent=False)
 
-    elif args.get(SHOW_VERSIONS) is not None:
+    elif args.command == "versions":
         versions_installed = installed_versions()
         if versions_installed:
             (current_ver, source) = (None, None)
@@ -86,7 +87,7 @@ def solc_select() -> None:
             print(
                 "No solc version installed. Run `solc-select install --help` for more information"
             )
-    elif args.get(UPGRADE) is not None:
+    elif args.command == "upgrade":
         upgrade_architecture()
     else:
         parser.parse_args(["--help"])

solc_select/solc_select.py

@@ -10,6 +10,7 @@
 import sys
 import urllib.request
 from pathlib import Path
+from typing import Dict, List, Tuple
 from zipfile import ZipFile
 
 from Crypto.Hash import keccak
@@ -61,7 +62,7 @@ def check_emulation_available() -> bool:
         return False
 
 
-def get_emulation_prefix() -> list:
+def get_emulation_prefix() -> List[str]:
     """Get the command prefix for emulation if needed."""
     if get_arch() != "arm64":
         return []
@@ -159,7 +160,7 @@ def upgrade_architecture() -> None:
         raise argparse.ArgumentTypeError("Run `solc-select install --help` for more information")
 
 
-def current_version() -> (str, str):
+def current_version() -> Tuple[str, str]:
     source = "SOLC_VERSION"
     version = os.environ.get(source)
     if not version:
@@ -182,7 +183,7 @@ def current_version() -> (str, str):
     return version, source
 
 
-def installed_versions() -> [str]:
+def installed_versions() -> List[str]:
     return [
         f.replace("solc-", "") for f in sorted(os.listdir(ARTIFACTS_DIR)) if f.startswith("solc-")
     ]
@@ -192,7 +193,7 @@ def artifact_path(version: str) -> Path:
     return ARTIFACTS_DIR.joinpath(f"solc-{version}", f"solc-{version}")
 
 
-def install_artifacts(versions: [str], silent: bool = False) -> bool:
+def install_artifacts(versions: List[str], silent: bool = False) -> bool:
     # Warn ARM64 users about compatibility on first install
     if get_arch() == "arm64" and not silent:
         warn_about_arm64()
@@ -274,7 +275,7 @@ def verify_checksum(version: str) -> None:
         )
 
 
-def get_soliditylang_checksums(version: str) -> (str, str):
+def get_soliditylang_checksums(version: str) -> Tuple[str, str]:
     (_, list_url) = get_url(version=version)
     # pylint: disable=consider-using-with
     list_json = urllib.request.urlopen(list_url).read()
@@ -289,7 +290,7 @@ def get_soliditylang_checksums(version: str) -> (str, str):
     return matches[0]["sha256"], matches[0]["keccak256"]
 
 
-def get_url(version: str = "", artifact: str = "") -> (str, str):
+def get_url(version: str = "", artifact: str = "") -> Tuple[str, str]:
     if soliditylang_platform() == LINUX_AMD64:
         if version != "" and is_older_linux(version):
             return (
@@ -353,14 +354,14 @@ def valid_install_arg(arg: str) -> str:
     return valid_version(arg)
 
 
-def get_installable_versions() -> [str]:
+def get_installable_versions() -> List[str]:
     installable = list(set(get_available_versions()) - set(installed_versions()))
     installable.sort(key=Version)
     return installable
 
 
 # pylint: disable=consider-using-with
-def get_available_versions() -> [str]:
+def get_available_versions() -> Dict[str, str]:
     (_, list_url) = get_url()
     list_json = urllib.request.urlopen(list_url).read()
     available_releases = json.loads(list_json)["releases"]

solc_select/utils.py

@@ -7,7 +7,7 @@
 from packaging.version import Version
 
 
-def mac_binary_is_universal(path: Path):
+def mac_binary_is_universal(path: Path) -> bool:
     """Check if the Mac binary is Universal or not. Will throw an exception if run on non-macOS."""
     assert sys.platform == "darwin"
     result = subprocess.run(["/usr/bin/file", str(path)], capture_output=True, check=False)