summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2008-06-08 05:38:13 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2008-06-08 05:38:13 +0000
commit102394b79db9fcbd6dec32a795e0d9d0a90afd11 (patch)
treed4587872775459d274dc907f178f939ab513c3fb
parent5675ae4443ae07325c97c70e4f951e1d6b06c2d3 (diff)
Fixed #6394: improved comment stripping in initial SQL files. Thanks, Thomas Guttler.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/management/sql.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/core/management/sql.py b/django/core/management/sql.py
index 574be5a1ee..c635fcab8a 100644
--- a/django/core/management/sql.py
+++ b/django/core/management/sql.py
@@ -446,7 +446,7 @@ def custom_sql_for_model(model):
fp = open(sql_file, 'U')
for statement in statements.split(fp.read().decode(settings.FILE_CHARSET)):
# Remove any comments from the file
- statement = re.sub(ur"--.*[\n\Z]", "", statement)
+ statement = re.sub(ur"--.*([\n\Z]|$)", "", statement)
if statement.strip():
output.append(statement + u";")
fp.close()