# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1419550128 21600
# Node ID d5d8e90d08b5b4a48b71ef27b1ab7322b3247668
# Parent  9676833dfdca77d1077431e02b71f0a6061a1965# Parent  b59c154d01634fa64b3bed22fd26b041a697bec9
Merge with upstream.

diff -r 9676833dfdca -r d5d8e90d08b5 downloads/management/commands/dlcatreport.py
--- 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)
 
 
diff -r 9676833dfdca -r d5d8e90d08b5 downloads/management/commands/dlwgetcat.py
--- 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)