X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bkmk_objects.py;h=b9dabff1e316a66c36d14a9f3d0911f4b60f6b2c;hb=aa22188fe3b2656a72616277b6d34bd448a86ada;hp=89647aa52eb57ecced2d4681834bba4b79f4ffaf;hpb=cb9c36b39ed72cd1fa272130d2bcf162a89c3013;p=bookmarks_db.git

diff --git a/bkmk_objects.py b/bkmk_objects.py
index 89647aa..b9dabff 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,12 +80,12 @@ 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')
+            href += host.encode('idna').decode('ascii')
             if port:
                 href += ':%d' % port
         if path:
@@ -223,8 +230,8 @@ def unquote_title(title):
     if BKMK_FORMAT == "MOZILLA":
         from HTMLParser import HTMLParser
         title = HTMLParser().unescape(
-            title.replace("&", '&').decode('utf-8'))
-        title = title.encode('utf-8').replace("'", "'")
+            title.replace("&", '&'))
+        title = title.replace("'", "'")
     return title