From 43aae70010d55b3e3ae216fd238eaf4ce7922ddd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20K=C3=B6gl?= Date: Mon, 8 Jun 2015 14:11:19 +0200 Subject: [PATCH] [Subscriptions] fix OPML upload --- mygpo/api/simple.py | 2 +- mygpo/web/views/device.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mygpo/api/simple.py b/mygpo/api/simple.py index 11662543..426514ff 100644 --- a/mygpo/api/simple.py +++ b/mygpo/api/simple.py @@ -197,7 +197,7 @@ def parse_subscription(raw_post_data, format): return [] urls = filter(None, urls) - urls = map(normalize_feed_url, urls) + urls = list(map(normalize_feed_url, urls)) return urls diff --git a/mygpo/web/views/device.py b/mygpo/web/views/device.py index c19b7cd7..dc3e4500 100644 --- a/mygpo/web/views/device.py +++ b/mygpo/web/views/device.py @@ -202,7 +202,7 @@ def upload_opml(request, device): if not 'opml' in request.FILES: return HttpResponseRedirect(reverse('device-edit', args=[device.uid])) - opml = request.FILES['opml'].read() + opml = request.FILES['opml'].read().decode('utf-8') try: subscriptions = simple.parse_subscription(opml, 'opml') -- 2.11.4.GIT