be more precise about types on ps/pdf stacks, remove most of the Any …

…annotations

pdfminer/cmapdb.py

@@ -264,7 +264,8 @@ def get_unicode_map(cls, name: str, vertical: bool = False) -> UnicodeMap:
         return cls._umap_cache[name][vertical]
 
 
-class CMapParser(PSStackParser):
+# int here means that we're not extending PSStackParser with additional types.
+class CMapParser(PSStackParser[int]):
 
     def __init__(self, cmap, fp):
         PSStackParser.__init__(self, fp)

pdfminer/converter.py

@@ -1,7 +1,7 @@
 import io
 import logging
 from pdfminer.pdfcolor import PDFColorSpace
-from typing import Any, List, Optional, Sequence
+from typing import Any, List, Optional, Sequence, cast
 import re
 import sys
 
@@ -27,7 +27,7 @@
 from .pdfinterp import PDFGraphicState, PDFResourceManager
 from .pdfpage import PDFPage
 from .pdftypes import PDFStream
-from .utils import Matrix, Rect, PathSegment
+from .utils import Point, Matrix, Rect, PathSegment
 from .utils import apply_matrix_pt
 from .utils import bbox2str
 from .utils import enc
@@ -104,7 +104,8 @@ def paint_path(self, gstate: PDFGraphicState, stroke: bool, fill: bool,
             # And, per Section 4.4's Table 4.9, all other path commands place
             # their point-position in their final two arguments. (Any preceding
             # arguments represent control points on Bézier curves.)
-            raw_pts = [p[-2:] if p[0] != 'h' else path[0][-2:] for p in path]
+            raw_pts = [cast(Point, p[-2:] if p[0] != 'h' else path[0][-2:])
+                       for p in path]
             pts = [apply_matrix_pt(self.ctm, pt) for pt in raw_pts]
 
             if shape in {'mlh', 'ml'}:

pdfminer/pdfdevice.py

@@ -1,7 +1,7 @@
-from typing import (Any, BinaryIO, Iterable, List, Optional, Sequence, Tuple,
+from typing import (Any, BinaryIO, Iterable, List, Optional, Sequence,
                     TYPE_CHECKING)
 from . import utils
-from .utils import Matrix, Point, Rect
+from .utils import Matrix, Point, Rect, PathSegment
 from .pdfcolor import PDFColorSpace
 from .pdffont import PDFFont
 from .pdffont import PDFUnicodeNotDefined
@@ -62,7 +62,7 @@ def end_figure(self, name: str) -> None:
 
     def paint_path(self, graphicstate: "PDFGraphicState", stroke: bool,
                    fill: bool, evenodd: bool,
-                   path: Sequence[Tuple[str, float, float]]) -> None:
+                   path: Sequence[PathSegment]) -> None:
         return
 
     def render_image(self, name: str, stream: PDFStream) -> None:

pdfminer/pdffont.py

@@ -80,7 +80,8 @@ def get_metrics(cls, fontname):
         return FONT_METRICS[fontname]
 
 
-class Type1FontHeaderParser(PSStackParser):
+# int here means that we're not extending PSStackParser with additional types.
+class Type1FontHeaderParser(PSStackParser[int]):
 
     KEYWORD_BEGIN = KWD(b'begin')
     KEYWORD_END = KWD(b'end')