diff options
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/staticfiles/management/commands/findstatic.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/django/contrib/staticfiles/management/commands/findstatic.py b/django/contrib/staticfiles/management/commands/findstatic.py index dc1e88d778..eaf63f7179 100644 --- a/django/contrib/staticfiles/management/commands/findstatic.py +++ b/django/contrib/staticfiles/management/commands/findstatic.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import os from optparse import make_option from django.core.management.base import LabelCommand -from django.utils.encoding import smart_text +from django.utils.encoding import force_text from django.contrib.staticfiles import finders @@ -19,13 +19,16 @@ class Command(LabelCommand): def handle_label(self, path, **options): verbosity = int(options.get('verbosity', 1)) result = finders.find(path, all=options['all']) - path = smart_text(path) + path = force_text(path) if result: if not isinstance(result, (list, tuple)): result = [result] - output = '\n '.join( - (smart_text(os.path.realpath(path)) for path in result)) - self.stdout.write("Found '%s' here:\n %s" % (path, output)) + result = (force_text(os.path.realpath(path)) for path in result) + if verbosity >= 1: + output = '\n '.join(result) + return "Found '%s' here:\n %s" % (path, output) + else: + return '\n'.join(result) else: if verbosity >= 1: self.stderr.write("No matching file found for '%s'." % path) |