Commit 6110c8aa116b50f2112376af0bf5cce2060c5831
1 parent
1ded675a
olevba3: fixed #322 - import reduce from functools
Showing
1 changed file
with
2 additions
and
1 deletions
oletools/olevba3.py
| @@ -77,7 +77,6 @@ https://github.com/unixfreak0037/officeparser | @@ -77,7 +77,6 @@ https://github.com/unixfreak0037/officeparser | ||
| 77 | # SOFTWARE. | 77 | # SOFTWARE. |
| 78 | 78 | ||
| 79 | from __future__ import print_function | 79 | from __future__ import print_function |
| 80 | -from functools import reduce | ||
| 81 | 80 | ||
| 82 | 81 | ||
| 83 | #------------------------------------------------------------------------------ | 82 | #------------------------------------------------------------------------------ |
| @@ -205,6 +204,7 @@ from functools import reduce | @@ -205,6 +204,7 @@ from functools import reduce | ||
| 205 | # 2018-03-19 PL: - removed pyparsing from the thirdparty subfolder | 204 | # 2018-03-19 PL: - removed pyparsing from the thirdparty subfolder |
| 206 | # 2018-05-13 v0.53 PL: - added support for Word/PowerPoint 2007+ XML (FlatOPC) | 205 | # 2018-05-13 v0.53 PL: - added support for Word/PowerPoint 2007+ XML (FlatOPC) |
| 207 | # (issue #283) | 206 | # (issue #283) |
| 207 | +# 2018-06-12 v0.53.1 MHW: - fixed #322: import reduce from functools | ||
| 208 | 208 | ||
| 209 | __version__ = '0.53.1' | 209 | __version__ = '0.53.1' |
| 210 | 210 | ||
| @@ -256,6 +256,7 @@ import zlib | @@ -256,6 +256,7 @@ import zlib | ||
| 256 | import email # for MHTML parsing | 256 | import email # for MHTML parsing |
| 257 | import string # for printable | 257 | import string # for printable |
| 258 | import json # for json output mode (argument --json) | 258 | import json # for json output mode (argument --json) |
| 259 | +from functools import reduce | ||
| 259 | 260 | ||
| 260 | # import lxml or ElementTree for XML parsing: | 261 | # import lxml or ElementTree for XML parsing: |
| 261 | try: | 262 | try: |