Changeset 1551

Timestamp:

Jan 11, 2019, 5:34:21 PM (7 years ago)

Author:

Silvan Scherrer

Message:

prefer less over more. use text when less fails and more is used. ticket #326

File:

• python/trunk/Lib/pydoc.py (modified) (2 diffs)

python/trunk/Lib/pydoc.py

@@ -1352 +1352 @@
     if os.environ.get('TERM') in ('dumb', 'emacs'):
         return plainpager
+    if hasattr(os, 'system') and os.system('(less) 2>/dev/null') == 0:
+        return lambda text: pipepager(text, 'less')
     if sys.platform == 'win32' or sys.platform.startswith('os2'):
         return lambda text: tempfilepager(plain(text), 'more <')
-    if hasattr(os, 'system') and os.system('(less) 2>/dev/null') == 0:
-        return lambda text: pipepager(text, 'less')
 
     import tempfile
@@ -1385 +1385 @@
     import tempfile
     filename = tempfile.mktemp()
-    file = open(filename, 'w')
+    if sys.platform.startswith('os2'):
+        file = open(filename, 'wt')
+    else:        
+        file = open(filename, 'w')
     file.write(text)
     file.close()