unittest: Add overloads to assert(Not)AlmostEqual(s) (#2901)

Author: jszopi

stdlib/2/unittest.pyi

@@ -89,20 +89,32 @@ class TestCase(Testable):
                         msg: object = ...) -> None: ...
     def failIfEqual(self, first: Any, second: Any,
                     msg: object = ...) -> None: ...
-    def assertAlmostEqual(self, first: float, second: float, places: int = ...,
-                          msg: object = ...,
-                          delta: float = ...) -> None: ...
-    def assertAlmostEquals(self, first: float, second: float, places: int = ...,
-                           msg: object = ...,
-                           delta: float = ...) -> None: ...
+    @overload
+    def assertAlmostEqual(self, first: float, second: float,
+                          places: int = ..., msg: Any = ...) -> None: ...
+    @overload
+    def assertAlmostEqual(self, first: float, second: float, *,
+                          msg: Any = ..., delta: float = ...) -> None: ...
+    @overload
+    def assertAlmostEquals(self, first: float, second: float,
+                           places: int = ..., msg: Any = ...) -> None: ...
+    @overload
+    def assertAlmostEquals(self, first: float, second: float, *,
+                           msg: Any = ..., delta: float = ...) -> None: ...
     def failUnlessAlmostEqual(self, first: float, second: float, places: int = ...,
                               msg: object = ...) -> None: ...
-    def assertNotAlmostEqual(self, first: float, second: float, places: int = ...,
-                             msg: object = ...,
-                             delta: float = ...) -> None: ...
-    def assertNotAlmostEquals(self, first: float, second: float, places: int = ...,
-                              msg: object = ...,
-                              delta: float = ...) -> None: ...
+    @overload
+    def assertNotAlmostEqual(self, first: float, second: float,
+                             places: int = ..., msg: Any = ...) -> None: ...
+    @overload
+    def assertNotAlmostEqual(self, first: float, second: float, *,
+                             msg: Any = ..., delta: float = ...) -> None: ...
+    @overload
+    def assertNotAlmostEquals(self, first: float, second: float,
+                              places: int = ..., msg: Any = ...) -> None: ...
+    @overload
+    def assertNotAlmostEquals(self, first: float, second: float, *,
+                              msg: Any = ..., delta: float = ...) -> None: ...
     def failIfAlmostEqual(self, first: float, second: float, places: int = ...,
                           msg: object = ...,
                           delta: float = ...) -> None: ...

stdlib/3/unittest/__init__.pyi

@@ -110,11 +110,12 @@ class TestCase:
         self, logger: Optional[logging.Logger] = ...,
         level: Union[int, str, None] = ...
     ) -> _AssertLogsContext: ...
-    def assertAlmostEqual(self, first: float, second: float, places: int = ...,
-                          msg: Any = ..., delta: float = ...) -> None: ...
     @overload
-    def assertNotAlmostEqual(self, first: float, second: float, *,
-                             msg: Any = ...) -> None: ...
+    def assertAlmostEqual(self, first: float, second: float,
+                          places: int = ..., msg: Any = ...) -> None: ...
+    @overload
+    def assertAlmostEqual(self, first: float, second: float, *,
+                          msg: Any = ..., delta: float = ...) -> None: ...
     @overload
     def assertNotAlmostEqual(self, first: float, second: float,
                              places: int = ..., msg: Any = ...) -> None: ...
@@ -173,13 +174,20 @@ class TestCase:
                          msg: Any = ...) -> _AssertRaisesContext[_E]: ...
     def failUnlessAlmostEqual(self, first: float, second: float,
                               places: int = ..., msg: Any = ...) -> None: ...
-    def assertAlmostEquals(self, first: float, second: float, places: int = ...,
+    @overload
+    def assertAlmostEquals(self, first: float, second: float,
+                           places: int = ..., msg: Any = ...) -> None: ...
+    @overload
+    def assertAlmostEquals(self, first: float, second: float, *,
                            msg: Any = ..., delta: float = ...) -> None: ...
     def failIfAlmostEqual(self, first: float, second: float, places: int = ...,
                           msg: Any = ...) -> None: ...
+    @overload
     def assertNotAlmostEquals(self, first: float, second: float,
-                              places: int = ..., msg: Any = ...,
-                              delta: float = ...) -> None: ...
+                              places: int = ..., msg: Any = ...) -> None: ...
+    @overload
+    def assertNotAlmostEquals(self, first: float, second: float, *,
+                              msg: Any = ..., delta: float = ...) -> None: ...
     def assertRegexpMatches(self, text: AnyStr, regex: Union[AnyStr, Pattern[AnyStr]],
                             msg: Any = ...) -> None: ...
     @overload