From ffefab152e7a38121e9e2a8aa8c04fcf9e08879e Mon Sep 17 00:00:00 2001
From: Tymoteusz Jankowski <tymoteusz.jankowski@gmail.com>
Date: Fri, 6 Dec 2019 22:17:44 +0100
Subject: [PATCH] Remove make_pager.cmd attribute

---
 dvc/dagascii.py             | 14 +++++++-------
 tests/unit/test_dagascii.py | 18 +++++++++++-------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/dvc/dagascii.py b/dvc/dagascii.py
index a8819bb01..ffe725820 100644
--- a/dvc/dagascii.py
+++ b/dvc/dagascii.py
@@ -27,14 +27,14 @@ DEFAULT_PAGER_FORMATTED = "{} --chop-long-lines --clear-screen".format(
 )
 
 
+def make_pager(cmd):
+    def pager(text):
+        return pydoc.tempfilepager(pydoc.plain(text), cmd)
+
+    return pager
+
+
 def find_pager():
-    def make_pager(cmd):
-        def pager(text):
-            return pydoc.tempfilepager(pydoc.plain(text), cmd)
-
-        pager.cmd = cmd
-        return pager
-
     if not sys.stdout.isatty():
         return pydoc.plainpager
 
diff --git a/tests/unit/test_dagascii.py b/tests/unit/test_dagascii.py
index 6e8ad4a10..6cb23adb2 100644
--- a/tests/unit/test_dagascii.py
+++ b/tests/unit/test_dagascii.py
@@ -4,15 +4,16 @@ from dvc import dagascii
 from dvc.env import DVC_PAGER
 
 
-def test_less_pager_returned_when_less_found(mocker):
+def test_find_pager_uses_default_pager_when_found(mocker):
+    m_make_pager = mocker.patch.object(dagascii, "make_pager")
     mocker.patch.object(os, "system", return_value=0)
 
-    pager = dagascii.find_pager()
+    dagascii.find_pager()
 
-    assert pager.cmd == dagascii.DEFAULT_PAGER_FORMATTED
+    m_make_pager.assert_called_once_with(dagascii.DEFAULT_PAGER_FORMATTED)
 
 
-def test_plainpager_returned_when_less_missing(mocker):
+def test_find_pager_returns_plain_pager_when_default_missing(mocker):
     mocker.patch.object(os, "system", return_value=1)
 
     pager = dagascii.find_pager()
@@ -20,9 +21,12 @@ def test_plainpager_returned_when_less_missing(mocker):
     assert pager.__name__ == "plainpager"
 
 
-def test_tempfilepager_returned_when_var_defined(monkeypatch):
+def test_find_pager_uses_custom_pager_when_env_var_is_defined(
+    mocker, monkeypatch
+):
+    m_make_pager = mocker.patch.object(dagascii, "make_pager")
     monkeypatch.setenv(DVC_PAGER, dagascii.DEFAULT_PAGER)
 
-    pager = dagascii.find_pager()
+    dagascii.find_pager()
 
-    assert pager.cmd == dagascii.DEFAULT_PAGER
+    m_make_pager.assert_called_once_with(dagascii.DEFAULT_PAGER)