olevba: added pyparsing into thirdparty folder

Philippe Lagadec
1 parent f1944c35
Showing 2 changed files with 7 additions and 4 deletions
oletools/olevba.py
setup.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 *
  
  
  
@@ -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',
+        ],
     }