morss/crawler.py

@@ -149,15 +149,6 @@ class GZIPHandler(BaseHandler):
 
 
 def detect_encoding(data, resp=None):
-    enc = detect_raw_encoding(data, resp)
-
-    if enc == 'gb2312':
-        enc = 'gbk'
-
-    return enc
-
-
-def detect_raw_encoding(data, resp=None):
     if resp is not None:
         enc = resp.headers.get('charset')
         if enc is not None:

morss/feeds.py

@@ -100,7 +100,7 @@ def parse(data, url=None, mimetype=None, encoding=None):
         try:
             feed = parser(data, encoding=encoding)
 
-        except (ValueError, SyntaxError):
+        except (ValueError):
             # parsing did not work
             pass