Skip to content

Fix context size setting #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

Fix context size setting #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
18dfff7
IPython.terminal.debugger.TerminalPdb does not receive any named args.
Aug 25, 2016
b4a1207
Add support of enviroment variable to retrive context size global for…
Aug 25, 2016
69c0cd1
Fix README
Aug 25, 2016
c0ff8bf
Fix typo
Aug 25, 2016
354d58a
Try ti fix autocompletion
Aug 26, 2016
1ce42da
Change README file
Aug 26, 2016
afb6578
Change README file
Aug 26, 2016
e09503c
Remove line from README
Sep 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Example usage:
ipdb.set_trace()
ipdb.set_trace(context=5) # will show five lines of code
# instead of the default three lines
# Or you can set it using IPDB_CONTEXT_SIZE env variable.
ipdb.pm()
ipdb.run('x[0] = 3')
result = ipdb.runcall(function, arg0, arg1, kwarg='foo')
Expand Down
15 changes: 11 additions & 4 deletions ipdb/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def import_module(possible_modules, needed_module):
if count == 0:
raise
try:
# IPython 5.0 and newer
# For some versions of IPython 5.x
from IPython.terminal.debugger import TerminalPdb as Pdb
from IPython.core.debugger import BdbQuit_excepthook
except ImportError:
Expand Down Expand Up @@ -70,9 +70,9 @@ def import_module(possible_modules, needed_module):


def _init_pdb(context=3):
if 'context' in getargspec(Pdb.__init__)[0]:
try:
p = Pdb(def_colors, context=context)
else:
except TypeError:
p = Pdb(def_colors)
p.rcLines += def_exec_lines
return p
Expand All @@ -86,7 +86,14 @@ def wrap_sys_excepthook():
sys.excepthook = BdbQuit_excepthook


def set_trace(frame=None, context=3):
def set_trace(frame=None, context=None):
if context:
pass
Copy link

@Garrett-R Garrett-R Sep 6, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm.... I'm slightly worried about this behavior. So, if I have my env var set, then I do: set_trace(context=7), the argumet gets ignored? It seems the argument should have precedence over an env var.

An alternative option may be:

def set_trace(frame=None, context=None):
    if context is None: 
        if os.getenv('IPDB_CONTEXT_SIZE') is not None:
            context = int(os.getenv('IPDB_CONTEXT_SIZE'))
        else:
            context = 3

Copy link
Author

@8tomat8 8tomat8 Sep 7, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, You are right, it will be more flexible =) But I made it in other way (I made commit).

Copy link

@Garrett-R Garrett-R Sep 8, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, I like it.

elif os.getenv('IPDB_CONTEXT_SIZE'):
context = int(os.environ['IPDB_CONTEXT_SIZE'])
Copy link

@disconnect3d disconnect3d May 7, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be:

if context is None:
    context = int(os.environ.get('IPDB_CONTEXT_SIZE', 3))

else:
context = 3

wrap_sys_excepthook()
if frame is None:
frame = sys._getframe().f_back
Expand Down