From f1fcb31ecd5710d1bbf0dd0c4a580dad7452f772 Mon Sep 17 00:00:00 2001
From: Christian Herdtweck <christian.herdtweck@intra2net.com>
Date: Wed, 27 Apr 2016 17:32:25 +0200
Subject: [PATCH] created PathNotFoundException in xglob; yield as 3rd arg instead of raising it

---
 oletools/thirdparty/xglob/xglob.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/oletools/thirdparty/xglob/xglob.py b/oletools/thirdparty/xglob/xglob.py
index 390e6e9..0e7c3da 100644
--- a/oletools/thirdparty/xglob/xglob.py
+++ b/oletools/thirdparty/xglob/xglob.py
@@ -60,6 +60,15 @@ __version__ = '0.05'
 
 import os, fnmatch, glob, zipfile
 
+#=== EXCEPTIONS ==============================================================
+
+class PathNotFoundException(Exception):
+    """ raised if given a fixed file/dir (not a glob) that does not exist """
+    def __init__(self, path):
+        super(PathNotFoundException, self).__init__(
+            'Given path does not exist: %r' % path)
+
+
 #=== FUNCTIONS ===============================================================
 
 # recursive glob function to find files in any subfolder:
@@ -118,8 +127,11 @@ def iter_files(files, recursive=False, zip_password=None, zip_fname='*'):
     - then files matching zip_fname are opened from the zip archive
 
     Iterator: yields (container, filename, data) for each file. If zip_password is None, then
-    only the filename is returned, container and data=None. Otherwise container si the
-    filename of the container (zip file), and data is the file content.
+    only the filename is returned, container and data=None. Otherwise container is the
+    filename of the container (zip file), and data is the file content (or an exception).
+    If a given filename is not a glob and does not exist, the triplet
+    (None, filename, PathNotFoundException) is yielded. (Globs matching nothing
+    do not trigger exceptions)
     """
     #TODO: catch exceptions and yield them for the caller (no file found, file is not zip, wrong password, etc)
     #TODO: use logging instead of printing
@@ -132,7 +144,7 @@ def iter_files(files, recursive=False, zip_password=None, zip_fname='*'):
         iglob = glob.iglob
     for filespec in files:
         if not is_glob(filespec) and not os.path.exists(filespec):
-            raise ValueError('given path {} does not exist!'.format(filespec))
+            yield None, PathNotFoundException(filespec), None
         for filename in iglob(filespec):
             if zip_password is not None:
                 # Each file is expected to be a zip archive:
--
libgit2 0.21.4