Skip to content

Commit 32078b1

Browse files
committed
Always use the pager
1 parent 448ec45 commit 32078b1

1 file changed

Lines changed: 6 additions & 25 deletions

File tree

Lib/_sitebuiltins.py

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def __init__(self, name, data, files=(), dirs=()):
3636
import os
3737
self.__name = name
3838
self.__data = data
39-
self.__lines = None
39+
self.__lines = []
4040
self.__filenames = [os.path.join(dir, filename)
4141
for dir in dirs
4242
for filename in files]
@@ -65,31 +65,12 @@ def __repr__(self):
6565
return "Type %s() to see the full %s text" % ((self.__name,)*2)
6666

6767
def __call__(self):
68-
import os
68+
from _pyrepl.pager import get_pager
6969
self.__setup()
70-
if "PYTHON_BASIC_REPL" in os.environ:
71-
prompt = 'Hit Return for more, or q (and Return) to quit: '
72-
lineno = 0
73-
while 1:
74-
try:
75-
for i in range(lineno, lineno + self.MAXLINES):
76-
print(self.__lines[i])
77-
except IndexError:
78-
break
79-
else:
80-
lineno += self.MAXLINES
81-
key = None
82-
while key is None:
83-
key = input(prompt)
84-
if key not in ('', 'q'):
85-
key = None
86-
if key == 'q':
87-
break
88-
else:
89-
from _pyrepl.pager import get_pager
90-
pager = get_pager()
91-
text = "\n".join(self.__lines)
92-
pager(text, title=self.__name)
70+
71+
pager = get_pager()
72+
text = "\n".join(self.__lines)
73+
pager(text, title=self.__name)
9374

9475

9576
class _Helper(object):

0 commit comments

Comments
 (0)