summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-02-22 00:43:29 +0000
committerJannis Leidel <jannis@leidel.info>2010-02-22 00:43:29 +0000
commit713bac952f44bde7b80b4266eecb270ea248f10d (patch)
tree3aa428ebc54bcc64d78b5f72895a510950b720f1
parent4261efdc673c8034aa372b790e5c1c7e591d4fbc (diff)
[1.1.X] Fixed #12655 - diffsettings command now returns the diff instead of printing. Thanks, jobscry.
Backport of r12463. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12480 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/management/commands/diffsettings.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/core/management/commands/diffsettings.py b/django/core/management/commands/diffsettings.py
index 70fe8d4677..98b53b405d 100644
--- a/django/core/management/commands/diffsettings.py
+++ b/django/core/management/commands/diffsettings.py
@@ -29,4 +29,4 @@ class Command(NoArgsCommand):
output.append("%s = %s ###" % (key, user_settings[key]))
elif user_settings[key] != default_settings[key]:
output.append("%s = %s" % (key, user_settings[key]))
- print '\n'.join(output)
+ return '\n'.join(output)