From f30b35acd128fa3d07514c7e89b34eb7e5f3a6ee Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Thu, 29 Mar 2012 14:45:19 -0700
Subject: [PATCH] Fixing Cyrillic text issue by both using encoded text from
 server with the help of requests, and then serving it with a defined charset
 encoding back to the client.

---
 apps/reader/views.py            | 2 +-
 apps/rss_feeds/models.py        | 2 +-
 apps/rss_feeds/page_importer.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/reader/views.py b/apps/reader/views.py
index ffe70210b..811abfd76 100644
--- a/apps/reader/views.py
+++ b/apps/reader/views.py
@@ -442,7 +442,7 @@ def load_feed_page(request, feed_id):
     if not data:
         data = "Fetching feed..."
     
-    return HttpResponse(data, mimetype='text/html')
+    return HttpResponse(data, mimetype="text/html; charset=utf-8")
     
 @json.json_view
 def load_starred_stories(request):
diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py
index 3ffe09b04..d28a62815 100644
--- a/apps/rss_feeds/models.py
+++ b/apps/rss_feeds/models.py
@@ -1201,7 +1201,7 @@ class MFeedPage(mongo.Document):
                 feed_page = MFeedPage.objects.filter(feed_id=feed.pk)
                 if feed_page:
                     data = feed_page[0].page_data and zlib.decompress(feed_page[0].page_data)
-                    
+
         return data
 
 class MStory(mongo.Document):
diff --git a/apps/rss_feeds/page_importer.py b/apps/rss_feeds/page_importer.py
index 18e9cba41..2fa12158a 100644
--- a/apps/rss_feeds/page_importer.py
+++ b/apps/rss_feeds/page_importer.py
@@ -58,7 +58,7 @@ class PageImporter(object):
                     data = response.read()
                 else:
                     response = requests.get(feed_link, headers=self.headers)
-                    data = response.content
+                    data = response.text
             elif any(feed_link.startswith(s) for s in BROKEN_PAGES):
                 self.save_no_page()
                 return