From 285c9efa9035bc70a15bfac5cb941f445217d79f Mon Sep 17 00:00:00 2001 From: Philippe Lagadec Date: Wed, 18 May 2016 23:27:31 +0200 Subject: [PATCH] olevba: restore imports after solving conflict with pull request 10 --- oletools/olevba.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/oletools/olevba.py b/oletools/olevba.py index 2d3976e..935ed5e 100755 --- a/oletools/olevba.py +++ b/oletools/olevba.py @@ -241,8 +241,12 @@ except ImportError: import thirdparty.olefile as olefile from thirdparty.prettytable import prettytable -from thirdparty.xglob import xglob -from thirdparty.pyparsing.pyparsing import * +from thirdparty.xglob import xglob, PathNotFoundException +from thirdparty.pyparsing.pyparsing import \ + CaselessKeyword, CaselessLiteral, Combine, Forward, Literal, \ + Optional, QuotedString,Regex, Suppress, Word, WordStart, \ + alphanums, alphas, hexnums,nums, opAssoc, srange, \ + infixNotation import ppt_parser # monkeypatch email to fix issue #32: -- libgit2 0.21.4