Commit 85bd93ee77eaa3d6cfef825f56adae64309b242a

Authored by Philippe Lagadec
1 parent d7dfefea

olevba: temporarily revert some changes to solve conflict with ppt_parser pull request

Showing 1 changed file with 2 additions and 6 deletions
oletools/olevba.py
... ... @@ -241,12 +241,8 @@ except ImportError:
241 241  
242 242 import thirdparty.olefile as olefile
243 243 from thirdparty.prettytable import prettytable
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
  244 +from thirdparty.xglob import xglob
  245 +from thirdparty.pyparsing.pyparsing import *
250 246  
251 247 # monkeypatch email to fix issue #32:
252 248 # allow header lines without ":"
... ...