Remove pretty print feature. make bpdb the default.

kdart · thomasballinger · commit d274ebab597c · 2015-04-13T15:05:47.000-04:00
diff --git a/bpython/args.py b/bpython/args.py
@@ -74,8 +74,6 @@ def parse(args, extras=None, ignore_stdin=False):
                       help=_("Don't flush the output to stdout."))
     parser.add_option('--version', '-V', action='store_true',
                       help=_('Print version and exit.'))
-    parser.add_option('--pretty', '-p', action='store_true',
-                      help=_('Pretty print output.'))
     parser.add_option('--debugger', '-D', action='store_true',
                       help=_('Enter a debugger on exceptions.'))
 
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -49,7 +49,6 @@
 import re
 import time
 import functools
-from pprint import pprint
 
 import struct
 if platform.system() != 'Windows':
@@ -1954,10 +1953,6 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
     return (exit_value, clirepl.getstdout())
 
 
-def prettydisplayhook(obj):
-    pprint(obj)
-
-
 def debugger_hook(exc, value, tb):
 
     if exc in (SyntaxError, IndentationError, KeyboardInterrupt):
@@ -2004,8 +1999,6 @@ def main(args=None, locals_=None, banner=None):
 
     if options.debugger:
         sys.excepthook = debugger_hook
-    if options.pretty:
-        sys.displayhook = prettydisplayhook
 
     try:
         (exit_value, output) = curses_wrapper(
diff --git a/bpython/config.py b/bpython/config.py
@@ -99,6 +99,7 @@ def loadini(struct, configfile):
             'clear_word': 'C-w',
             'copy_clipboard': 'F10',
             'cut_to_buffer': 'C-k',
+            'debug': 'F12',
             'delete': 'C-d',
             'down_one_line': 'C-n',
             'edit_config': 'F3',
@@ -123,7 +124,6 @@ def loadini(struct, configfile):
             'undo': 'C-r',
             'up_one_line': 'C-p',
             'yank_from_buffer': 'C-y',
-            'debug': 'F12',
         },
         'cli': {
             'suggestion_width': 0.8,
diff --git a/bpython/debugger.py b/bpython/debugger.py
@@ -21,7 +21,7 @@
 
 def _get_debugger():
     global post_mortem
-    modname = os.environ.get("PYTHON_DEBUGGER", "pdb")
+    modname = os.environ.get("PYTHON_DEBUGGER", "bpdb")
     __import__(modname)
     mod = sys.modules[modname]
     pm = getattr(mod, "post_mortem")
