From b9b82e2516843d4c5d2d0d72ee35461e74cc9b1a Mon Sep 17 00:00:00 2001 From: Philippe Lagadec Date: Tue, 16 Jun 2015 21:57:17 +0200 Subject: [PATCH] olevba: added pyparsing into thirdparty folder --- oletools/olevba.py | 4 +--- setup.py | 7 ++++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/oletools/olevba.py b/oletools/olevba.py index 827b7f8..67444f9 100755 --- a/oletools/olevba.py +++ b/oletools/olevba.py @@ -208,9 +208,7 @@ except ImportError: import thirdparty.olefile as olefile from thirdparty.prettytable import prettytable from thirdparty.xglob import xglob - -# TODO: move to thirdparty -from pyparsing import * +from thirdparty.pyparsing.pyparsing import * diff --git a/setup.py b/setup.py index 40c4f55..02e76c6 100755 --- a/setup.py +++ b/setup.py @@ -15,6 +15,7 @@ to install this package. # 2015-01-05 v0.07: - added xglob, prettytable # 2015-02-08 v0.08: - added DridexUrlDecoder # 2015-03-23 v0.09: - updated description and classifiers, added shebang line +# 2015-06-16 v0.10: - added pyparsing #--- TODO --------------------------------------------------------------------- @@ -36,7 +37,7 @@ import sys, os, fnmatch #--- METADATA ----------------------------------------------------------------- name = "oletools" -version = '0.11' +version = '0.12' desc = "Python tools to analyze security characteristics of MS Office and OLE files (also called Structured Storage, Compound File Binary Format or Compound Document File Format), for Malware Analysis and Incident Response #DFIR" long_desc = open('oletools/README.rst').read() author ="Philippe Lagadec" @@ -74,6 +75,7 @@ packages=[ 'oletools.thirdparty.prettytable', 'oletools.thirdparty.xglob', 'oletools.thirdparty.DridexUrlDecoder', + 'oletools.thirdparty.pyparsing', ] ##setupdir = '.' ##package_dir={'': setupdir} @@ -168,6 +170,9 @@ package_data={ 'oletools.thirdparty.DridexUrlDecoder': [ 'LICENSE.txt', ], + 'oletools.thirdparty.pyparsing': [ + 'LICENSE', 'README', + ], } -- libgit2 0.21.4