do not try to use zlib's _Decompress

[loctrkd.git] / gps303 / ocid_dload.py

diff --git a/gps303/ocid_dload.py b/gps303/ocid_dload.py
index 0bdb8b70e29e916147f94b56d502c500141bc677..dfd013f9dbed519c3c21b49a485af218402275cd 100644 (file)
--- a/gps303/ocid_dload.py
+++ b/gps303/ocid_dload.py
@@ -1,8 +1,9 @@
-from configparser import NoOptionError
+from configparser import ConfigParser, NoOptionError
 import csv
 from logging import getLogger
 import requests
 from sqlite3 import connect
+from typing import Any, IO, Optional
 from zlib import decompressobj, MAX_WBITS
 
 from . import common
@@ -41,13 +42,13 @@ class unzipped:
     and yelds them as strings.
     """
 
-    def __init__(self, zstream):
+    def __init__(self, zstream: IO[bytes]) -> None:
         self.zstream = zstream
-        self.decoder = decompressobj(16 + MAX_WBITS)
+        self.decoder: Optional[Any] = decompressobj(16 + MAX_WBITS)
         self.outdata = b""
         self.line = b""
 
-    def read(self, n=None):
+    def read(self, n: int = 1024) -> bytes:
         if self.decoder is None:
             return b""
         while len(self.outdata) < n:
@@ -61,7 +62,7 @@ class unzipped:
             return data
         return b""
 
-    def __next__(self):
+    def __next__(self) -> str:
         while True:
             splittry = self.line.split(b"\n", maxsplit=1)
             if len(splittry) > 1:
@@ -74,11 +75,11 @@ class unzipped:
         self.line = rest
         return line.decode("utf-8")
 
-    def __iter__(self):
+    def __iter__(self) -> "unzipped":
         return self
 
 
-def main(conf):
+def main(conf: ConfigParser) -> None:
     try:
         url = conf.get("opencellid", "downloadurl")
         mcc = "<unspecified>"