X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bkmk_objects.py;h=4850261ef529c854708b5eb0437323720ed9d41e;hb=e784339181e160ebaf4ee5e21e00c50712823421;hp=7777ba33fc0bb9b35a862690e9d95238d355374e;hpb=b2b302b348f0b711557961c70744c818cff664f0;p=bookmarks_db.git

diff --git a/bkmk_objects.py b/bkmk_objects.py
index 7777ba3..4850261 100644
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -15,7 +15,14 @@ __all__ = ['Folder', 'Bookmark', 'Ruler', 'Walker', 'Writer', 'Robot',
 
 
 import os
-import urllib
+try:
+    from urllib.parse import quote, \
+        splittype, splithost, splituser, splitpasswd, \
+        splitport
+except ImportError:
+    from urllib import quote, \
+        splittype, splithost, splituser, splitpasswd, \
+        splitport
 
 BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")
 
@@ -58,14 +65,14 @@ class Bookmark(object):
     def __init__(self, href, add_date, last_visit=None, last_modified=None,
                  keyword=None, comment='', icon_href=None, icon=None,
                  charset=None, parser_charset=None):
-        protocol, request = urllib.splittype(href)
+        protocol, request = splittype(href)
         user, password, port = None, None, None
-        host, path = urllib.splithost(request)
+        host, path = splithost(request)
         if host:
-            user, host = urllib.splituser(host)
+            user, host = splituser(host)
             if user:
-                user, password = urllib.splitpasswd(user)
-            host, port = urllib.splitport(host)
+                user, password = splitpasswd(user)
+            host, port = splitport(host)
             if port: port = int(port)
 
         if protocol == 'place':
@@ -73,9 +80,9 @@ class Bookmark(object):
         else:
             href = protocol + "://"
         if user:
-            href += urllib.quote(user)
+            href += quote(user)
             if password:
-                href += ':' + urllib.quote(password)
+                href += ':' + quote(password)
             href += '@'
         if host:
             href += host.decode(parser_charset or 'utf-8').encode('idna')
@@ -152,7 +159,8 @@ class InverseLinker(Walker):
 
     def start_folder(self, f, level):
         f.parent = self.parent_stack[-1]
-        self.parent_stack.append(f)  # Push the folder onto the stack of parents
+        # Push the folder onto the stack of parents
+        self.parent_stack.append(f)
 
     def end_folder(self, f, level):
         del self.parent_stack[-1]   # Pop off the stack
@@ -183,7 +191,8 @@ class Linear(Walker):
         self.add_object(r)
 
 
-# Helper - make linked linear represenatation of the tree, suitable to be stored in sequential storage
+# Helper - make linked linear represenatation of the tree,
+# suitable to be stored in sequential storage.
 def make_linear(root_folder):
     linker = InverseLinker()
     root_folder.walk_depth(linker)
@@ -192,7 +201,8 @@ def make_linear(root_folder):
     root_folder.walk_depth(linear)
 
 
-# Helper, opposite of make_linear - make a tree from the linked linear representation
+# Helper, opposite of make_linear -
+# make a tree from the linked linear representation.
 def make_tree(linear):
     root_folder = linear[0]
     del linear[0]
@@ -219,7 +229,8 @@ def quote_title(title):
 def unquote_title(title):
     if BKMK_FORMAT == "MOZILLA":
         from HTMLParser import HTMLParser
-        title = HTMLParser().unescape(title.replace("&", '&').decode('utf-8'))
+        title = HTMLParser().unescape(
+            title.replace("&", '&').decode('utf-8'))
         title = title.encode('utf-8').replace("'", "'")
     return title