Skip to content
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

Jump to bottom

Use a dict to de-duplicate filenames, and thus reduce the size of the to_dict() #38

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use a dict to de-duplicate filenames, and thus reduce the size of the to_dict() #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 23 additions & 2 deletions src/tblib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,19 @@ def __tproxy_handler(self, operation, *args, **kwargs):

def to_dict(self):
"""Convert a Traceback into a dictionary representation"""
# Create a compression dictionary, to be filled as we go, and stuff it
# into the top level.
zipper = {}
result = self._to_compressed_dict(zipper)
result['zip'] = zipper
return result

def _to_compressed_dict(self, zipper):
"""Convert a Traceback into a dictionary with optimised filename storage"""
if self.tb_next is None:
tb_next = None
else:
tb_next = self.tb_next.to_dict()
tb_next = self.tb_next._to_compressed_dict(zipper)

code = {
'co_filename': self.tb_frame.f_code.co_filename,
Expand All @@ -153,6 +162,9 @@ def to_dict(self):
'f_globals': self.tb_frame.f_globals,
'f_code': code,
}

# Update the filename entries with integers.
code['co_filename'] = zipper.setdefault(code['co_filename'], len(zipper))
return {
'tb_frame': frame,
'tb_lineno': self.tb_lineno,
Expand All @@ -161,11 +173,20 @@ def to_dict(self):

@classmethod
def from_dict(cls, dct):
# Have zip keyed by strings was ideal for JSON transport, now we need
# to switch to doing lookups the other way around.
zipper = {v: k for k, v in dct['zip'].items()}
return cls._from_compressed_dict(dct, zipper)

@classmethod
def _from_compressed_dict(cls, dct, zipper):
if dct['tb_next']:
tb_next = cls.from_dict(dct['tb_next'])
tb_next = cls._from_compressed_dict(dct['tb_next'], zipper)
else:
tb_next = None

# Update the filename entries with strings.
dct['tb_frame']['f_code']['co_filename'] = zipper[dct['tb_frame']['f_code']['co_filename']]
code = _AttrDict(
co_filename=dct['tb_frame']['f_code']['co_filename'],
co_name=dct['tb_frame']['f_code']['co_name'],
Expand Down