X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bkmk_objects.py;h=a8c75f279b39962034ca8b8f4ca8e954d183051c;hb=9951d55c2c685e920a3dfccb842b35bd70f5dceb;hp=4847e2c991c53ba5beb4b474a7913d1313108e15;hpb=643f6e704848a0aa271d1bbe460200ab6d6e4613;p=bookmarks_db.git diff --git a/bkmk_objects.py b/bkmk_objects.py index 4847e2c..a8c75f2 100644 --- a/bkmk_objects.py +++ b/bkmk_objects.py @@ -1,13 +1,11 @@ """Objects to represent bookmarks.html structure 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__ = ['Folder', 'Bookmark', 'Ruler', 'Walker', 'Writer', 'Robot', @@ -51,7 +49,7 @@ class Folder(list): walker.end_folder(self, level) -class Bookmark: +class Bookmark(object): isFolder = 0 isBookmark = 1 @@ -68,7 +66,10 @@ class Bookmark: host, port = urllib.splitport(host) if port: port = int(port) - href = protocol + "://" + if protocol == 'place': + href = protocol + ":" + else: + href = protocol + "://" if user: href += urllib.quote(user) if password: @@ -92,12 +93,12 @@ class Bookmark: self.charset = charset -class Ruler: +class Ruler(object): isFolder = 0 isBookmark = 0 -class Walker: +class Walker(object): """ Interface class. Any instance that will be passed to Folder.walk_depth may be derived from this class. It is not mandatory - unlike Java @@ -134,7 +135,7 @@ class Writer(Walker): return self.prune == folder.name -class Robot: +class Robot(object): def __init__(self, log): self.log = log