Skip to content

Commit

Permalink
Fixed processing of lists in config file (#954)
Browse files Browse the repository at this point in the history
* fixed handling of lists in config file

* changed list to tuple
  • Loading branch information
reu-res authored and zachriggle committed Apr 18, 2017
1 parent 2714a30 commit e90fb15
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pwnlib/context/__init__.py
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

0 comments on commit e90fb15

Please sign in to comment.