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

Fixed processing of lists in config file #954

Merged
merged 2 commits into from
Apr 18, 2017
Merged

Fixed processing of lists in config file #954

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ac70d0
fixed handling of lists in config file
Apr 18, 2017
26df36d
changed list to tuple
reu-res Apr 18, 2017
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
4 changes: 2 additions & 2 deletions pwnlib/context/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ class ContextType(object):
'os': 'linux',
'proxy': None,
'signed': False,
'terminal': None,
'terminal': tuple(),
'timeout': Timeout.maximum,
}

Expand Down Expand Up @@ -1359,7 +1359,7 @@ def update_context_defaults(section):
if key not in ContextType.defaults:
log.warn("Unknown configuration option %r in section %r" % (key, 'context'))
continue
if isinstance(ContextType.defaults[key], (str, unicode)):
if isinstance(ContextType.defaults[key], (str, unicode, tuple)):
value = safeeval.expr(value)

ContextType.defaults[key] = value
Expand Down