Unify pen argument names

Lib/fontTools/cu2qu/ufo.py

@@ -24,6 +24,7 @@
 """
 
 import logging
+from typing import Tuple
 from fontTools.pens.basePen import AbstractPen
 from fontTools.pens.pointPen import PointToSegmentPen
 from fontTools.pens.reverseContourPen import ReverseContourPen
@@ -64,34 +65,38 @@ class GetSegmentsPen(AbstractPen):
     duplicated between segments.
     """
 
-    def __init__(self):
+    def __init__(self) -> None:
         self._last_pt = None
         self.segments = []
 
-    def _add_segment(self, tag, *args):
+    def _add_segment(self, tag, *args) -> None:
         if tag in ['move', 'line', 'qcurve', 'curve']:
             self._last_pt = args[-1]
         self.segments.append((tag, args))
 
-    def moveTo(self, pt):
+    def moveTo(self, pt) -> None:
         self._add_segment('move', pt)
 
-    def lineTo(self, pt):
+    def lineTo(self, pt) -> None:
         self._add_segment('line', pt)
 
-    def qCurveTo(self, *points):
+    def qCurveTo(self, *points) -> None:
         self._add_segment('qcurve', self._last_pt, *points)
 
-    def curveTo(self, *points):
+    def curveTo(self, *points) -> None:
         self._add_segment('curve', self._last_pt, *points)
 
-    def closePath(self):
+    def closePath(self) -> None:
         self._add_segment('close')
 
-    def endPath(self):
+    def endPath(self) -> None:
         self._add_segment('end')
 
-    def addComponent(self, glyphName, transformation):
+    def addComponent(
+        self,
+        glyphName: str,
+        transformation: Tuple[float, float, float, float, float, float],
+    ) -> None:
         pass
 
 

Lib/fontTools/pens/areaPen.py

@@ -1,27 +1,28 @@
 """Calculate the area of a glyph."""
 
-from fontTools.pens.basePen import BasePen
+from typing import Any, Dict, Optional
+from fontTools.pens.basePen import BasePen, PenGlyphSet, PenPoint
 
 
 __all__ = ["AreaPen"]
 
 
 class AreaPen(BasePen):
 
-	def __init__(self, glyphset=None):
+	def __init__(self, glyphset: PenGlyphSet = None) -> None:
 		BasePen.__init__(self, glyphset)
-		self.value = 0
+		self.value: float = 0
 
-	def _moveTo(self, p0):
+	def _moveTo(self, p0: PenPoint) -> None:
 		self._p0 = self._startPoint = p0
 
-	def _lineTo(self, p1):
+	def _lineTo(self, p1: PenPoint) -> None:
 		x0, y0 = self._p0
 		x1, y1 = p1
 		self.value -= (x1 - x0) * (y1 + y0) * .5
 		self._p0 = p1
 
-	def _qCurveToOne(self, p1, p2):
+	def _qCurveToOne(self, p1: PenPoint, p2: PenPoint) -> None:
 		# https://github.com/Pomax/bezierinfo/issues/44
 		p0 = self._p0
 		x0, y0 = p0[0], p0[1]
@@ -31,26 +32,26 @@ def _qCurveToOne(self, p1, p2):
 		self._lineTo(p2)
 		self._p0 = p2
 
-	def _curveToOne(self, p1, p2, p3):
+	def _curveToOne(self, p1: PenPoint, p2: PenPoint, p3: PenPoint) -> None:
 		# https://github.com/Pomax/bezierinfo/issues/44
 		p0 = self._p0
 		x0, y0 = p0[0], p0[1]
 		x1, y1 = p1[0] - x0, p1[1] - y0
 		x2, y2 = p2[0] - x0, p2[1] - y0
 		x3, y3 = p3[0] - x0, p3[1] - y0
 		self.value -= (
-				x1 * (   -   y2 -   y3) +
-				x2 * (y1        - 2*y3) +
-				x3 * (y1 + 2*y2       )
-			      ) * 0.15
+			x1 * (   -   y2 -   y3) +
+			x2 * (y1        - 2*y3) +
+			x3 * (y1 + 2*y2       )
+		) * 0.15
 		self._lineTo(p3)
 		self._p0 = p3
 
-	def _closePath(self):
+	def _closePath(self) -> None:
 		self._lineTo(self._startPoint)
 		del self._p0, self._startPoint
 
-	def _endPath(self):
+	def _endPath(self) -> None:
 		if self._p0 != self._startPoint:
 			# Area is not defined for open contours.
 			raise NotImplementedError