Skip to content

Use current line number for frame objects instead of first line. #50

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

Merged
mdickinson merged 2 commits into from
Mar 13, 2014
Merged

Use current line number for frame objects instead of first line. #50

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7893034
Use current line number for frame objects instead of first line.
mdickinson Mar 13, 2014
eeb1c84
Merge remote-tracking branch 'origin/master' into fix-frame-line-number
mdickinson Mar 13, 2014
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
11 changes: 8 additions & 3 deletions refcycle/annotations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,14 @@ def add_frame_references(obj, references):
add_attr(obj, "f_trace", references)
# The f_locals dictionary is only created on demand,
# and then cached.
f_locals = obj.f_locals
add_attr(obj, "f_locals", references)
for name, local in six.iteritems(obj.f_locals):
references[local].append("local {!r}".format(name))
# Some badly-behaved code replaces the f_locals dict with
# something that doesn't support the full dict interface. So we
# only continue with the annotation if f_locals is a Python dict.
if type(f_locals) is dict:
Copy link
Copy Markdown
Owner Author

@mdickinson mdickinson Mar 13, 2014

Choose a reason for hiding this comment

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

Whoops; this change wasn't intended to be included in this PR.

for name, local in six.iteritems(obj.f_locals):
references[local].append("local {!r}".format(name))


def add_getset_descriptor_references(obj, references):
Expand Down Expand Up @@ -200,7 +205,7 @@ def object_annotation(obj):
filename = "..." + filename[-(FRAME_FILENAME_LIMIT-3):]
return "frame\\n{}:{}".format(
filename,
obj.f_code.co_firstlineno,
obj.f_lineno,
)
else:
return "object\\n{}.{}".format(
Expand Down