change code for Python v3

Author: bear

ronkyuu/__init__.py

@@ -13,7 +13,7 @@
 __download_url__ = 'https://pypi.python.org/pypi/ronkyuu'
 __description__  = 'Webmention Manager'
 
-from tools import discoverConfig                                                     # noqa
-from webmention import findMentions, findEndpoint, discoverEndpoint, sendWebmention  # noqa
-from relme import findRelMe, confirmRelMe                                            # noqa
-from validators import URLValidator                                                  # noqa
+from .tools import discoverConfig                                                     # noqa
+from .webmention import findMentions, findEndpoint, discoverEndpoint, sendWebmention  # noqa
+from .relme import findRelMe, confirmRelMe                                            # noqa
+from .validators import URLValidator                                                  # noqa

ronkyuu/relme.py

@@ -6,12 +6,16 @@
 IndieWeb Rel=Me Tools
 """
 
-from tools import normalizeURL, cleanURL
+from .tools import normalizeURL, cleanURL
 
 import requests
-from urlparse import urlparse
 from bs4 import BeautifulSoup
 
+try:  # Python v3
+    from urllib.parse import urlparse
+except ImportError:
+    from urlparse import urlparse
+
 
 _html_parser = 'html5lib'   # 'html.parser', 'lxml', 'lxml-xml'
 

ronkyuu/tools.py

@@ -10,7 +10,11 @@
 import re
 import json
 import shlex
-from urlparse import urlsplit, urlunsplit
+
+try:  # Python v3
+    from urllib.parse import urlsplit, urlunsplit
+except ImportError:
+    from urlparse import urlsplit, urlunsplit
 
 import requests
 

ronkyuu/validators.py

@@ -14,7 +14,12 @@
 """
 
 import re
-from urlparse import urlsplit, urlunsplit
+
+try:  # Python v3
+    from urllib.parse import urlsplit, urlunsplit
+except ImportError:
+    from urlparse import urlsplit, urlunsplit
+
 
 class RegexValidator(object):
     regex = ''

ronkyuu/webmention.py

@@ -7,12 +7,16 @@
 """
 
 import requests
-from urlparse import urlparse, urljoin
 from bs4 import BeautifulSoup
-
-from validators import URLValidator
+from .validators import URLValidator
 from .tools import parse_link_header
 
+try:  # Python v3
+    from urllib.parse import urlparse, urljoin
+except ImportError:
+    from urlparse import urlparse, urljoin
+
+
 _html_parser = 'html5lib'   # 'html.parser', 'lxml', 'lxml-xml'
 
 
@@ -73,7 +77,8 @@ def findMentions(sourceURL, targetURL=None, exclude_domains=[], content=None, te
         # Allow passing BS doc as content
         if isinstance(content, BeautifulSoup):
             __doc__ = content
-            result.update({'content': unicode(__doc__)})
+            # result.update({'content': unicode(__doc__)})
+            result.update({'content': str(__doc__)})
         else:
             __doc__ = BeautifulSoup(content, _html_parser)
             result.update({'content': content})

setup.py

@@ -38,7 +38,6 @@ def extract_metaitem(meta):
         license=extract_metaitem('license'),
         packages=find_packages(exclude=('tests', 'docs')),
         platforms=['Any'],
-        use_2to3=True,
         install_requires=[
             'requests',
             'beautifulsoup4',
@@ -55,8 +54,6 @@ def extract_metaitem(meta):
             'Programming Language :: Python :: 2',
             'Programming Language :: Python :: 2.7',
             'Programming Language :: Python :: 3',
-            'Programming Language :: Python :: 3.3',
-            'Programming Language :: Python :: 3.4',
             'Programming Language :: Python :: 3.5',
             'Topic :: Software Development :: Libraries :: Python Modules',
         ]