-

Ram Rachum · Ram Rachum · commit 43d3946afbec · 2011-02-15T22:50:25.000+02:00
diff --git a/garlicsim/garlicsim/general_misc/nifty_collections/ordered_dict.py b/garlicsim/garlicsim/general_misc/nifty_collections/ordered_dict.py
@@ -20,7 +20,6 @@
 #     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 #     OTHER DEALINGS IN THE SOFTWARE.
 
-# blocktodo: move out of third party
 
 from UserDict import DictMixin
 
diff --git a/misc/testing/zip/make_zip.py b/misc/testing/zip/make_zip.py
@@ -21,36 +21,33 @@
 from __future__ import with_statement
 
 import sys
+import re
+import fnmatch
 import os.path
 import zipfile
 import contextlib
 import shutil
 
 
-def zip_folder(folder, zip_path, ignored_extenstions=[]):
+def zip_folder(folder, zip_path, ignored_patterns=[]):
     '''
+
     note: creates a folder inside the zip with the same name of the original
     folder, in contrast to other implementation which put all of the files on
     the root level of the zip.
     
     Doesn't put empty folders in the zip file.
+    
+    tododoc ignored_patterns, they're fnmatch style
     '''
     assert os.path.isdir(folder)
     source_folder = os.path.realpath(folder)
     
+    ignored_re_patterns = [re.compile(fnmatch.translate(ignored_pattern)) for
+                           ignored_pattern in ignored_patterns]
+    
     zip_name = os.path.splitext(os.path.split(zip_path)[1])[0]
     source_folder_name = os.path.split(source_folder)[1]
-    
-    ### Ensuring ignored extensions start with '.': ###########################
-    #                                                                         #
-    for ignored_extenstion in ignored_extenstions:
-        if not ignored_extenstion.startswith('.'):
-            ignored_extenstions[
-                ignored_extenstions.index(ignored_extenstion)
-                ] = \
-            ('.' + ignored_extenstion)
-    #                                                                         #
-    ### Finished ensuring ignored extensions start with '.'. ##################
             
     with contextlib.closing(
         zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED)
@@ -60,9 +57,9 @@ def zip_folder(folder, zip_path, ignored_extenstions=[]):
             
             for file_path in files:
                 
-                extension = os.path.splitext(file_path)[1]
-                if extension in ignored_extenstions:
-                    continue
+                for ignored_re_pattern in ignored_re_patterns:
+                    if ignored_re_pattern.match(file_path):
+                        continue
                 
                 absolute_file_path = os.path.join(root, file_path)
                 
@@ -114,7 +111,7 @@ def make_zip():
         
         sys.stdout.write('Zipping... ')
         zip_folder(package_path, zip_destination_path,
-                   ignored_extenstions=['.pyc', '.pyo'])
+                   ignored_patterns=['*.pyc', '*.pyo', '*__pycache__*'])
         
         sys.stdout.write('Done.\n')
     #                                                                         #
