Process http error 307 as a temporary redirect.

[bookmarks_db.git] / Robots / bkmk_rsimple.py

diff --git a/Robots/bkmk_rsimple.py b/Robots/bkmk_rsimple.py
index ebb3f8b2b895f26576174f10c16115d10cabb72d..09b1fbdb11880e96eef0a3ffbbb934248b9e5504 100644 (file)
--- a/Robots/bkmk_rsimple.py
+++ b/Robots/bkmk_rsimple.py
@@ -1,7 +1,7 @@
 """
    Simple, strightforward robot
 
-   Written by Oleg BroytMann. Copyright (C) 2000-2007 PhiloSoft Design.
+   Written by Oleg BroytMann. Copyright (C) 2000-2008 PhiloSoft Design.
 """
 
 import sys, os
@@ -40,6 +40,8 @@ class MyURLopener(urllib.URLopener):
 
    # Error 301 -- also relocated (permanently)
    http_error_301 = http_error_302
+   # Error 307 -- also relocated (temporary)
+   http_error_307 = http_error_302
 
    # Error 401 -- authentication required
    def http_error_401(self, url, fp, errcode, errmsg, headers, data=None): 
@@ -157,14 +159,15 @@ class robot_simple(Robot):
             try:
                content_type = headers["Content-Type"]
                try:
+                  # extract charset from "text/html; foo; charset=UTF-8, bar; baz;"
                   content_type, charset = content_type.split(';', 1)
                   content_type = content_type.strip()
-                  charset = charset.split('=')[1].strip()
+                  charset = charset.split('=')[1].strip().split(',')[0]
                   self.log("   HTTP charset   : %s" % charset)
                except (ValueError, IndexError):
                   charset = None
                   self.log("   no charset in Content-Type header")
-               if content_type == "text/html":
+               if content_type in ("text/html", "application/xhtml+xml"):
                   parser = parse_html(fname, charset, self.log)
                   bookmark.real_title = parser.title
                   if parser.refresh: