Commits

Andrew Godwin committed 554530f Merge

Merging in justinlilly's migrations-as-dirs

Comments (0)

Files changed (1)

south/migration.py

     Returns a list of migration file names for the given app.
     """
     if getattr(settings, "SOUTH_USE_PYC", False):
-        allowed_extensions = (".pyc", ".py")
+        allowed_extensions = (".pyc", ".py", "")
         ignored_files = ("__init__.pyc", "__init__.py")
     else:
-        allowed_extensions = (".py",)
+        allowed_extensions = (".py", "")
         ignored_files = ("__init__.py",)
-    
-    return sorted(set([
-        os.path.splitext(filename)[0]
-        for filename in os.listdir(os.path.dirname(app.__file__))
-        if os.path.splitext(filename)[1] in allowed_extensions and filename not in ignored_files and not filename.startswith(".")
-    ]))
+
+
+    filenames = set()
+    for filename in os.listdir(os.path.dirname(app.__file__)):
+        if os.path.splitext(filename)[1] in allowed_extensions \
+           and filename not in ignored_files \
+           and not filename.startswith("."):
+
+            # if its a folder, and doesn't have an __init__.py file
+            if os.path.splitext(filename)[1] is "" \
+                and os.path.isdir(filename) \
+                and "__init__.py" not in os.listdir(os.path.join(os.path.dirname(app.__file__), filename)):
+                continue
+
+            filenames.add(os.path.splitext(filename)[0])
+    return sorted(filenames)
 
 
 def get_migration_classes(app):
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.