From 85bd93ee77eaa3d6cfef825f56adae64309b242a Mon Sep 17 00:00:00 2001 From: Philippe Lagadec Date: Wed, 18 May 2016 23:23:11 +0200 Subject: [PATCH] olevba: temporarily revert some changes to solve conflict with ppt_parser pull request --- oletools/olevba.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/oletools/olevba.py b/oletools/olevba.py index 5ef162f..a587105 100755 --- a/oletools/olevba.py +++ b/oletools/olevba.py @@ -241,12 +241,8 @@ except ImportError: import thirdparty.olefile as olefile from thirdparty.prettytable import prettytable -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 +from thirdparty.xglob import xglob +from thirdparty.pyparsing.pyparsing import * # monkeypatch email to fix issue #32: # allow header lines without ":" -- libgit2 0.21.4