diff --git a/stdlib/2and3/zipfile.pyi b/stdlib/2and3/zipfile.pyi
index 1216371e9..72021f35e 100644
--- a/stdlib/2and3/zipfile.pyi
+++ b/stdlib/2and3/zipfile.pyi
@@ -6,7 +6,6 @@ import io
 import os
 import sys
 
-
 if sys.version_info >= (3, 6):
     _Path = Union[os.PathLike[str], str]
 else:
@@ -14,12 +13,12 @@ else:
 _SZI = Union[Text, ZipInfo]
 _DT = Tuple[int, int, int, int, int, int]
 
-
 if sys.version_info >= (3,):
     class BadZipFile(Exception): ...
     BadZipfile = BadZipFile
 else:
     class BadZipfile(Exception): ...
+
 error = BadZipfile
 
 class LargeZipFile(Exception): ...
@@ -37,8 +36,14 @@ class ZipExtFile(io.BufferedIOBase):
     newlines: Optional[List[bytes]]
     mode: str
     name: str
-
-    def __init__(self, fileobj: IO[bytes], mode: str, zipinfo: ZipInfo, decrypter: Optional[Callable[[Sequence[int]], bytes]] = ..., close_fileobj: bool = ...) -> None: ...
+    def __init__(
+        self,
+        fileobj: IO[bytes],
+        mode: str,
+        zipinfo: ZipInfo,
+        decrypter: Optional[Callable[[Sequence[int]], bytes]] = ...,
+        close_fileobj: bool = ...,
+    ) -> None: ...
     def __repr__(self) -> str: ...
     def peek(self, n: int = ...) -> bytes: ...
     def read1(self, n: Optional[int]) -> bytes: ...  # type: ignore
@@ -73,47 +78,39 @@ class ZipFile:
         ) -> None: ...
     else:
         def __init__(
-            self, file: Union[_Path, IO[bytes]], mode: Text = ..., compression: int = ..., allowZip64: bool = ...,
+            self, file: Union[_Path, IO[bytes]], mode: Text = ..., compression: int = ..., allowZip64: bool = ...
         ) -> None: ...
     def __enter__(self) -> ZipFile: ...
-    def __exit__(self, exc_type: Optional[Type[BaseException]],
-                 exc_val: Optional[BaseException],
-                 exc_tb: Optional[TracebackType]) -> None: ...
+    def __exit__(
+        self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]
+    ) -> None: ...
     def close(self) -> None: ...
     def getinfo(self, name: Text) -> ZipInfo: ...
     def infolist(self) -> List[ZipInfo]: ...
     def namelist(self) -> List[Text]: ...
-    def open(self, name: _SZI, mode: Text = ...,
-             pwd: Optional[bytes] = ...) -> IO[bytes]: ...
-    def extract(self, member: _SZI, path: Optional[_SZI] = ...,
-                pwd: bytes = ...) -> str: ...
-    def extractall(self, path: Optional[_Path] = ...,
-                   members: Optional[Iterable[Text]] = ...,
-                   pwd: Optional[bytes] = ...) -> None: ...
+    def open(self, name: _SZI, mode: Text = ..., pwd: Optional[bytes] = ...) -> IO[bytes]: ...
+    def extract(self, member: _SZI, path: Optional[_SZI] = ..., pwd: bytes = ...) -> str: ...
+    def extractall(
+        self, path: Optional[_Path] = ..., members: Optional[Iterable[Text]] = ..., pwd: Optional[bytes] = ...
+    ) -> None: ...
     def printdir(self) -> None: ...
     def setpassword(self, pwd: bytes) -> None: ...
     def read(self, name: _SZI, pwd: Optional[bytes] = ...) -> bytes: ...
     def testzip(self) -> Optional[str]: ...
-    def write(self, filename: _Path, arcname: Optional[_Path] = ...,
-              compress_type: Optional[int] = ...) -> None: ...
+    def write(self, filename: _Path, arcname: Optional[_Path] = ..., compress_type: Optional[int] = ...) -> None: ...
     if sys.version_info >= (3,):
-        def writestr(self, zinfo_or_arcname: _SZI, data: Union[bytes, str],
-                     compress_type: Optional[int] = ...) -> None: ...
+        def writestr(self, zinfo_or_arcname: _SZI, data: Union[bytes, str], compress_type: Optional[int] = ...) -> None: ...
     else:
-        def writestr(self,
-                     zinfo_or_arcname: _SZI, bytes: bytes,
-                     compress_type: Optional[int] = ...) -> None: ...
+        def writestr(self, zinfo_or_arcname: _SZI, bytes: bytes, compress_type: Optional[int] = ...) -> None: ...
 
 class PyZipFile(ZipFile):
     if sys.version_info >= (3,):
-        def __init__(self, file: Union[str, IO[bytes]], mode: str = ...,
-                     compression: int = ..., allowZip64: bool = ...,
-                     opimize: int = ...) -> None: ...
-        def writepy(self, pathname: str, basename: str = ...,
-                    filterfunc: Optional[Callable[[str], bool]] = ...) -> None: ...
+        def __init__(
+            self, file: Union[str, IO[bytes]], mode: str = ..., compression: int = ..., allowZip64: bool = ..., opimize: int = ...
+        ) -> None: ...
+        def writepy(self, pathname: str, basename: str = ..., filterfunc: Optional[Callable[[str], bool]] = ...) -> None: ...
     else:
-        def writepy(self,
-                    pathname: Text, basename: Text = ...) -> None: ...
+        def writepy(self, pathname: Text, basename: Text = ...) -> None: ...
 
 class ZipInfo:
     filename: Text
@@ -133,13 +130,13 @@ class ZipInfo:
     CRC: int
     compress_size: int
     file_size: int
-    def __init__(self, filename: Optional[Text] = ...,
-                 date_time: Optional[_DT] = ...) -> None: ...
+    def __init__(self, filename: Optional[Text] = ..., date_time: Optional[_DT] = ...) -> None: ...
     if sys.version_info >= (3, 6):
         def is_dir(self) -> bool: ...
+        @classmethod
+        def from_file(cls, filename: _Path, arcname: Optional[_Path] = ...) -> ZipInfo: ...
     def FileHeader(self, zip64: Optional[bool] = ...) -> bytes: ...
 
-
 def is_zipfile(filename: Union[_Path, IO[bytes]]) -> bool: ...
 
 ZIP_STORED: int