Skip to content

Commit d665644

Browse files
Feyorshpeace-maker
andauthored
Support context.timeout in ~/.pwn.conf (#2592)
* Add float to supported config types This change functionally just allows setting `context.timeout` in ~/.pwn.conf. * update changelog --------- Co-authored-by: peace-maker <[email protected]>
1 parent 00f707d commit d665644

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ The table below shows which release corresponds to each branch, and what date th
9696
- [#2590][2590] Add support for finding corefiles under WSL2
9797
- [#2496][2496] Add linux ko file search support
9898
- [#2542][2542] Decode `_IO_*` flags in `FileStructure` member
99+
- [#2592][2592] pwnlib.config: Fix customization of `context.timeout`
99100

100101
[2419]: https://github.com/Gallopsled/pwntools/pull/2419
101102
[2551]: https://github.com/Gallopsled/pwntools/pull/2551
@@ -118,6 +119,7 @@ The table below shows which release corresponds to each branch, and what date th
118119
[2590]: https://github.com/Gallopsled/pwntools/pull/2590
119120
[2496]: https://github.com/Gallopsled/pwntools/pull/2496
120121
[2542]: https://github.com/Gallopsled/pwntools/pull/2542
122+
[2592]: https://github.com/Gallopsled/pwntools/pull/2592
121123

122124
## 4.15.0 (`beta`)
123125

pwnlib/context/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1757,7 +1757,7 @@ def update_context_defaults(section):
17571757

17581758
default = ContextType.defaults[key]
17591759

1760-
if isinstance(default, (str, int, tuple, list, dict)):
1760+
if isinstance(default, (str, int, float, tuple, list, dict)):
17611761
value = safeeval.expr(value)
17621762
else:
17631763
log.warn("Unsupported configuration option %r in section %r" % (key, 'context'))

0 commit comments

Comments
 (0)