X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_rsimple.py;h=2c4df9e278f99b186daa869720f9437c81f7cefa;hb=d9360788a641b5b1184a2523881e950bab7d7c66;hp=5242d5765a8ae10ecd42cb8dcd02a3a74e031845;hpb=17dbed2fe53e1433b754c3485a4565e0565c73dc;p=bookmarks_db.git diff --git a/Robots/bkmk_rsimple.py b/Robots/bkmk_rsimple.py index 5242d57..2c4df9e 100644 --- a/Robots/bkmk_rsimple.py +++ b/Robots/bkmk_rsimple.py @@ -1,13 +1,11 @@ """Simple, strightforward robot This file is a part of Bookmarks database and Internet robot. + """ -__version__ = "$Revision$"[11:-2] -__revision__ = "$Id$"[5:-2] -__date__ = "$Date$"[7:-2] __author__ = "Oleg Broytman " -__copyright__ = "Copyright (C) 2000-2011 PhiloSoft Design" +__copyright__ = "Copyright (C) 2000-2014 PhiloSoft Design" __license__ = "GNU GPL" __all__ = ['robot_simple', 'get_error'] @@ -22,13 +20,15 @@ from m_lib.net.www.util import parse_time from m_lib.md5wrapper import md5wrapper from bkmk_objects import Robot -from parse_html import parse_html +from parse_html import parse_filename class RedirectException(Exception): reloc_dict = { 301: "perm.", - 302: "temp.", + 302: "temp2.", + 303: "temp3.", + 307: "temp7.", "html": "html" } def __init__(self, errcode, newurl): @@ -182,7 +182,7 @@ class robot_simple(Robot): else: html = False if html: - parser = parse_html(fname, charset, self.log) + parser = parse_filename(fname, charset, self.log) if parser: bookmark.real_title = parser.title icon = parser.icon