summaryrefslogtreecommitdiff
path: root/chimere/utils.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2013-05-29 14:03:49 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2013-05-29 14:03:49 +0200
commitdd13d935ca6e92205cb57e356b35a23039bf78e2 (patch)
tree4f878f7436569b7bf9a3652d8935017dfa584ab8 /chimere/utils.py
parent412a8a7b8822620c632d8ca61ac3e1c37f3e88f8 (diff)
parent2bcbefae1072c8d1a73e74f59804d5001ca6c7d2 (diff)
downloadChimère-dd13d935ca6e92205cb57e356b35a23039bf78e2.tar.bz2
Chimère-dd13d935ca6e92205cb57e356b35a23039bf78e2.zip
Merge branch 'v2.0'
Diffstat (limited to 'chimere/utils.py')
-rw-r--r--chimere/utils.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/chimere/utils.py b/chimere/utils.py
index f5bc44f..f5379aa 100644
--- a/chimere/utils.py
+++ b/chimere/utils.py
@@ -593,7 +593,8 @@ class GeoRSSManager(ImportManager):
from models import Marker
new_item, updated_item, msg = 0, 0, ''
feed = feedparser.parse(self.importer_instance.source)
- if feed['bozo']:
+ if feed['bozo'] and not isinstance(feed['bozo_exception'],
+ feedparser.CharacterEncodingOverride):
return (0, 0, _(u"RSS feed is not well formed"))
for item in feed['items']:
if "georss_point" not in item and 'georss_line' not in item \