Ticket #17628: makemessages-ignore-dirs.diff

django/core/management/commands/makemessages.py

@@ -44 +44 @@
     p = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE, close_fds=os.name != 'nt', universal_newlines=True)
     return p.communicate()
 
-def walk(root, topdown=True, onerror=None, followlinks=False):
+def walk(root, topdown=True, onerror=None, followlinks=False, ignore_patterns=[], verbosity=0):
     """
     A version of os.walk that can follow symlinks for Python < 2.6
     """
     for dirpath, dirnames, filenames in os.walk(root, topdown, onerror):
+        remove_dirs = []
+        for dirname in dirnames:
+            if is_ignored(os.path.normpath(os.path.join(dirpath, dirname)), ignore_patterns):
+                remove_dirs.append(dirname)
+        for dirname in remove_dirs:
+            dirnames.remove(dirname)
+            if verbosity > 1:
+                sys.stdout.write('ignoring directory %s\n' % dirname)
         yield (dirpath, dirnames, filenames)
         if followlinks:
             for d in dirnames:
@@ -71 +79 @@
     Helper function to get all files in the given root.
     """
     all_files = []
-    for (dirpath, dirnames, filenames) in walk(".", followlinks=symlinks):
+    for (dirpath, dirnames, filenames) in walk(".", followlinks=symlinks,
+                                    ignore_patterns=ignore_patterns, verbosity=verbosity):
         for f in filenames:
             norm_filepath = os.path.normpath(os.path.join(dirpath, f))
             if is_ignored(norm_filepath, ignore_patterns):