From 2a5ffb48c5a503d7b0c31b9499ed069a9a5daf3b Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Sat, 11 May 2013 23:39:46 -0700
Subject: [PATCH] Handling another unicode decode issue in uploaded OPMLs.

---
 apps/feed_import/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/feed_import/views.py b/apps/feed_import/views.py
index 6f05e2887..6df85e730 100644
--- a/apps/feed_import/views.py
+++ b/apps/feed_import/views.py
@@ -3,6 +3,7 @@ import pickle
 import base64
 from utils import log as logging
 from oauth2client.client import OAuth2WebServerFlow, FlowExchangeError
+from bson.errors import InvalidStringData
 import uuid
 from django.contrib.sites.models import Site
 # from django.db import IntegrityError
@@ -36,7 +37,7 @@ def opml_upload(request):
             xml_opml = file.read()
             try:
                 uploaded_opml = UploadedOPML.objects.create(user_id=request.user.pk, opml_file=xml_opml)
-            except UnicodeDecodeError:
+            except (UnicodeDecodeError, InvalidStringData):
                 uploaded_opml = None
                 folders = None
                 code = -1