Commit 285c9efa9035bc70a15bfac5cb941f445217d79f
1 parent
649f2e0f
olevba: restore imports after solving conflict with pull request 10
Showing
1 changed file
with
6 additions
and
2 deletions
oletools/olevba.py
| @@ -241,8 +241,12 @@ except ImportError: | @@ -241,8 +241,12 @@ except ImportError: | ||
| 241 | 241 | ||
| 242 | import thirdparty.olefile as olefile | 242 | import thirdparty.olefile as olefile |
| 243 | from thirdparty.prettytable import prettytable | 243 | from thirdparty.prettytable import prettytable |
| 244 | -from thirdparty.xglob import xglob | ||
| 245 | -from thirdparty.pyparsing.pyparsing import * | 244 | +from thirdparty.xglob import xglob, PathNotFoundException |
| 245 | +from thirdparty.pyparsing.pyparsing import \ | ||
| 246 | + CaselessKeyword, CaselessLiteral, Combine, Forward, Literal, \ | ||
| 247 | + Optional, QuotedString,Regex, Suppress, Word, WordStart, \ | ||
| 248 | + alphanums, alphas, hexnums,nums, opAssoc, srange, \ | ||
| 249 | + infixNotation | ||
| 246 | import ppt_parser | 250 | import ppt_parser |
| 247 | 251 | ||
| 248 | # monkeypatch email to fix issue #32: | 252 | # monkeypatch email to fix issue #32: |