summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2013-05-29 14:04:08 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2013-05-29 14:04:08 +0200
commit60344d3998fc1d1ef772b64a4b917c4f8818113d (patch)
tree3cf59d99d2edf76839bdc4f95ff7b16b4ded6fff
parent5eed2c5d5659c0d829b2812b2fdab947b102dcb8 (diff)
parentdd13d935ca6e92205cb57e356b35a23039bf78e2 (diff)
downloadChimère-60344d3998fc1d1ef772b64a4b917c4f8818113d.tar.bz2
Chimère-60344d3998fc1d1ef772b64a4b917c4f8818113d.zip
Merge branch 'master' into nef
-rw-r--r--chimere/utils.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/chimere/utils.py b/chimere/utils.py
index f86e5db..7463a50 100644
--- a/chimere/utils.py
+++ b/chimere/utils.py
@@ -598,7 +598,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 \