Merge pull request #537 from JohnVillalovos/jlvillal/mypy_setup

Add type-hints to `setup.py` and `imapclient/config.py`. Also use `argparse.Namespace` instead of `Bunch`

Author: mjs

imapclient/config.py

@@ -2,21 +2,23 @@
 # Released subject to the New BSD License
 # Please see http://en.wikipedia.org/wiki/BSD_licenses
 
+import argparse
 import configparser
 import json
+import os
 import ssl
 import urllib.parse
 import urllib.request
-from os import environ, path
+from typing import Any, Callable, Dict, Optional, Tuple, TYPE_CHECKING, TypeVar
 
 import imapclient
 
 
-def getenv(name, default):
-    return environ.get("imapclient_" + name, default)
+def getenv(name: str, default: Optional[str]) -> Optional[str]:
+    return os.environ.get("imapclient_" + name, default)
 
 
-def get_config_defaults():
+def get_config_defaults() -> Dict[str, Any]:
     return {
         "username": getenv("username", None),
         "password": getenv("password", None),
@@ -35,7 +37,7 @@ def get_config_defaults():
     }
 
 
-def parse_config_file(filename):
+def parse_config_file(filename: str) -> argparse.Namespace:
     """Parse INI files containing IMAP connection details.
 
     Used by livetest.py and interact.py
@@ -50,12 +52,13 @@ def parse_config_file(filename):
 
     conf.alternates = {}
     for section in parser.sections():
+        # pylint: disable=no-member
         conf.alternates[section] = _read_config_section(parser, section)
 
     return conf
 
 
-def get_string_config_defaults():
+def get_string_config_defaults() -> Dict[str, str]:
     out = {}
     for k, v in get_config_defaults().items():
         if v is True:
@@ -68,14 +71,19 @@ def get_string_config_defaults():
     return out
 
 
-def _read_config_section(parser, section):
-    def get(name):
+T = TypeVar("T")
+
+
+def _read_config_section(
+    parser: configparser.ConfigParser, section: str
+) -> argparse.Namespace:
+    def get(name: str) -> str:
         return parser.get(section, name)
 
-    def getboolean(name):
+    def getboolean(name: str) -> bool:
         return parser.getboolean(section, name)
 
-    def get_allowing_none(name, typefunc):
+    def get_allowing_none(name: str, typefunc: Callable[[str], T]) -> Optional[T]:
         try:
             v = parser.get(section, name)
         except configparser.NoOptionError:
@@ -84,17 +92,17 @@ def get_allowing_none(name, typefunc):
             return None
         return typefunc(v)
 
-    def getint(name):
+    def getint(name: str) -> Optional[int]:
         return get_allowing_none(name, int)
 
-    def getfloat(name):
+    def getfloat(name: str) -> Optional[float]:
         return get_allowing_none(name, float)
 
     ssl_ca_file = get("ssl_ca_file")
     if ssl_ca_file:
-        ssl_ca_file = path.expanduser(ssl_ca_file)
+        ssl_ca_file = os.path.expanduser(ssl_ca_file)
 
-    return Bunch(
+    return argparse.Namespace(
         host=get("host"),
         port=getint("port"),
         ssl=getboolean("ssl"),
@@ -120,7 +128,9 @@ def getfloat(name):
 }
 
 
-def refresh_oauth2_token(hostname, client_id, client_secret, refresh_token):
+def refresh_oauth2_token(
+    hostname: str, client_id: str, client_secret: str, refresh_token: str
+) -> str:
     url = OAUTH2_REFRESH_URLS.get(hostname)
     if not url:
         raise ValueError("don't know where to refresh OAUTH2 token for %r" % hostname)
@@ -135,14 +145,19 @@ def refresh_oauth2_token(hostname, client_id, client_secret, refresh_token):
         url, urllib.parse.urlencode(post).encode("ascii")
     ) as request:
         response = request.read()
-    return json.loads(response.decode("ascii"))["access_token"]
+    result = json.loads(response.decode("ascii"))["access_token"]
+    if TYPE_CHECKING:
+        assert isinstance(result, str)
+    return result
 
 
 # Tokens are expensive to refresh so use the same one for the duration of the process.
-_oauth2_cache = {}
+_oauth2_cache: Dict[Tuple[str, str, str, str], str] = {}
 
 
-def get_oauth2_token(hostname, client_id, client_secret, refresh_token):
+def get_oauth2_token(
+    hostname: str, client_id: str, client_secret: str, refresh_token: str
+) -> str:
     cache_key = (hostname, client_id, client_secret, refresh_token)
     token = _oauth2_cache.get(cache_key)
     if token:
@@ -153,7 +168,9 @@ def get_oauth2_token(hostname, client_id, client_secret, refresh_token):
     return token
 
 
-def create_client_from_config(conf, login=True):
+def create_client_from_config(
+    conf: argparse.Namespace, login: bool = True
+) -> imapclient.IMAPClient:
     assert conf.host, "missing host"
 
     ssl_context = None
@@ -200,14 +217,3 @@ def create_client_from_config(conf, login=True):
     except:  # noqa: E722
         client.shutdown()
         raise
-
-
-class Bunch(dict):
-    def __getattr__(self, k):
-        try:
-            return self[k]
-        except KeyError:
-            raise AttributeError
-
-    def __setattr__(self, k, v):
-        self[k] = v

imapclient/imapclient.py

@@ -9,6 +9,7 @@
 import re
 import select
 import socket
+import ssl as ssl_lib
 import sys
 import warnings
 from datetime import date, datetime
@@ -247,7 +248,7 @@ def __init__(
         use_uid: bool = True,
         ssl: bool = True,
         stream: bool = False,
-        ssl_context: Optional[str] = None,
+        ssl_context: Optional[ssl_lib.SSLContext] = None,
         timeout: Optional[float] = None,
     ):
         if stream:
@@ -386,7 +387,7 @@ def starttls(self, ssl_context=None):
         self._imap.file = self._imap.sock.makefile("rb")
         return data[0]
 
-    def login(self, username, password):
+    def login(self, username: str, password: str):
         """Login using *username* and *password*, returning the
         server response.
         """
@@ -403,7 +404,13 @@ def login(self, username, password):
         logger.debug("Logged in as %s", username)
         return rv
 
-    def oauth2_login(self, user, access_token, mech="XOAUTH2", vendor=None):
+    def oauth2_login(
+        self,
+        user: str,
+        access_token: str,
+        mech: str = "XOAUTH2",
+        vendor: Optional[str] = None,
+    ):
         """Authenticate using the OAUTH2 or XOAUTH2 methods.
 
         Gmail and Yahoo both support the 'XOAUTH2' mechanism, but Yahoo requires
@@ -517,7 +524,7 @@ def logout(self):
         logger.debug("Logged out, connection closed")
         return data[0]
 
-    def shutdown(self):
+    def shutdown(self) -> None:
         """Close the connection to the IMAP server (without logging out)
 
         In most cases, :py:meth:`.logout` should be used instead of

pyproject.toml

@@ -47,12 +47,10 @@ warn_unused_ignores = true
 # Overrides for currently untyped modules
 [[tool.mypy.overrides]]
 module = [
-    "imapclient.config",
     "imapclient.imapclient",
     "imapclient.interact",
     "interact",
     "livetest",
-    "setup",
 ]
 ignore_errors = true
 

setup.py

@@ -5,13 +5,14 @@
 # Please see http://en.wikipedia.org/wiki/BSD_licenses
 
 from os import path
+from typing import Dict
 
-from setuptools import setup
+from setuptools import setup  # type: ignore[import]
 
 # Read version info
 here = path.dirname(__file__)
 version_file = path.join(here, "imapclient", "version.py")
-info = {}
+info: Dict[str, str] = {}
 exec(open(version_file).read(), {}, info)
 
 desc = """\