Mercurial > public > sg101

changeset 875:d5d8e90d08b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with upstream.
author Brian Neal <bgneal@gmail.com>
date Thu, 25 Dec 2014 17:28:48 -0600
parents 9676833dfdca (current diff) b59c154d0163 (diff)
children bab6b1eac1e2
files
diffstat 2 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/downloads/management/commands/dlcatreport.py	Mon Dec 22 20:10:15 2014 -0600
+++ b/downloads/management/commands/dlcatreport.py	Thu Dec 25 17:28:48 2014 -0600
@@ -45,14 +45,12 @@
             'downloads': downloads,
             })
 
-        # encode it ourselves since it can fail if you try to redirect output to
-        # a file and any of the content is not ASCII...
-        self.stdout.write(report.encode('utf-8'))
+        self.stdout.write(report)
 
     def print_titles(self, dls):
         """Print out the download titles"""
 
         for dl in dls:
-            self.stdout.write(dl.title.encode('utf-8'))
+            self.stdout.write(dl.title)
 
 
--- a/downloads/management/commands/dlwgetcat.py	Mon Dec 22 20:10:15 2014 -0600
+++ b/downloads/management/commands/dlwgetcat.py	Thu Dec 25 17:28:48 2014 -0600
@@ -48,6 +48,4 @@
             'MEDIA_URL': settings.MEDIA_URL,
             })
 
-        # encode it ourselves since it can fail if you try to redirect output to
-        # a file and any of the content is not ASCII...
-        self.stdout.write(output.encode('utf-8'))
+        self.stdout.write(output)