Merge remote-tracking branch 'refs/remotes/origin/filelike-pager' into filelike-pager

Author: craigds

src/click/_termui_impl.py

@@ -447,7 +447,13 @@ def _pipepager(cmd: str, color: t.Optional[bool]) -> t.Generator[t.Tuple[t.Binar
 
 
 @contextlib.contextmanager
+<<<<<<< HEAD
 def _tempfilepager(cmd: str, color: t.Optional[bool]=None) -> t.Generator[t.Tuple[t.BinaryIO, str, bool], None, None]:
+||||||| 2e06de8
+def _tempfilepager(cmd: str, color: t.Optional[bool]=None):
+=======
+def _tempfilepager(cmd: str, color: t.Optional[bool] = None):
+>>>>>>> refs/remotes/origin/filelike-pager
     """Page through text by invoking a program on a temporary file."""
     import tempfile
 
@@ -459,7 +465,13 @@ def _tempfilepager(cmd: str, color: t.Optional[bool]=None) -> t.Generator[t.Tupl
 
 
 @contextlib.contextmanager
+<<<<<<< HEAD
 def _nullpager(stream: t.TextIO, color: t.Optional[bool]=None) -> t.Generator[t.Tuple[t.BinaryIO, str, bool], None, None]:
+||||||| 2e06de8
+def _nullpager(stream: t.TextIO, color: t.Optional[bool]=None):
+=======
+def _nullpager(stream: t.TextIO, color: t.Optional[bool] = None):
+>>>>>>> refs/remotes/origin/filelike-pager
     """Simply print unformatted text.  This is the ultimate fallback."""
     encoding = get_best_encoding(stream)
     yield stream, encoding, color