Prepare for py3 port.

src/url_shortener/__init__.py

@@ -1,2 +1,3 @@
-import shorteners
-from __main__ import *
+from __future__ import absolute_import
+from . import shorteners
+from .__main__ import *

src/url_shortener/__main__.py

@@ -1,45 +1,46 @@
-from functools import wraps
-import shorteners
-
-
-def service_selecter (func):
- @wraps(func)
- def wrapper (*args, **kwargs):
-  tmp = dict(kwargs)
-  if 'service' in tmp:
-   del(tmp['service'])
-   kwargs['service'] = find_service(kwargs['service'], **tmp) or default_service()
-  else:
-   kwargs['service'] = default_service()
-  return func(*args, **kwargs)
- return wrapper
-
-@service_selecter
-def shorten (url, service=None, **kwargs):
- return service(**kwargs).shorten(url)
-
-
-@service_selecter
-def unshorten (url, service=None, **kwargs):
- return service(**kwargs).unshorten(url)
-
-
-def default_service ():
- return shorteners.TinyurlShortener
-
-def find_service (service, **kwargs):
- for i in shorteners.__all__:
-  obj = getattr(shorteners, i)(**kwargs)
-  if obj.name.lower() == service.lower():
-   return getattr(shorteners, i)
-
-def list_services ():
- return [getattr(shorteners, i)().name for i in shorteners.__all__]
-
-def unshorten_any (url):
- """Unshortens an URL using any available unshortener. Check to see if unshortened URL was created by a shortener (nested) and unshorten if so."""
- unshortened_url = shorteners.URLShortener().unshorten(url)
- # None is returned if URL not unshortened
- if unshortened_url:
-  return unshorten_any(unshortened_url)
- return url
+from __future__ import absolute_import
+from functools import wraps
+from . import shorteners
+
+
+def service_selecter (func):
+ @wraps(func)
+ def wrapper (*args, **kwargs):
+  tmp = dict(kwargs)
+  if 'service' in tmp:
+   del(tmp['service'])
+   kwargs['service'] = find_service(kwargs['service'], **tmp) or default_service()
+  else:
+   kwargs['service'] = default_service()
+  return func(*args, **kwargs)
+ return wrapper
+
+@service_selecter
+def shorten (url, service=None, **kwargs):
+ return service(**kwargs).shorten(url)
+
+
+@service_selecter
+def unshorten (url, service=None, **kwargs):
+ return service(**kwargs).unshorten(url)
+
+
+def default_service ():
+ return shorteners.TinyurlShortener
+
+def find_service (service, **kwargs):
+ for i in shorteners.__all__:
+  obj = getattr(shorteners, i)(**kwargs)
+  if obj.name.lower() == service.lower():
+   return getattr(shorteners, i)
+
+def list_services ():
+ return [getattr(shorteners, i)().name for i in shorteners.__all__]
+
+def unshorten_any (url):
+ """Unshortens an URL using any available unshortener. Check to see if unshortened URL was created by a shortener (nested) and unshorten if so."""
+ unshortened_url = shorteners.URLShortener().unshorten(url)
+ # None is returned if URL not unshortened
+ if unshortened_url:
+  return unshorten_any(unshortened_url)
+ return url

src/url_shortener/shorteners/__init__.py

@@ -1,9 +1,10 @@
-from url_shortener import URLShortener
-from hkcim import HKCShortener
-from isgd import IsgdShortener
-from onjme import OnjmeShortener
-from tinyarrows import TinyArrowsShortener
-from tinyurl import TinyurlShortener
-from xedcc import XedccShortener
-from clckru import ClckruShortener
-__all__ = ["HKCShortener", "IsgdShortener", "OnjmeShortener", "TinyArrowsShortener", "TinyurlShortener", "XedccShortener", "ClckruShortener"]
+from __future__ import absolute_import
+from .url_shortener import URLShortener
+from .hkcim import HKCShortener
+from .isgd import IsgdShortener
+from .onjme import OnjmeShortener
+from .tinyarrows import TinyArrowsShortener
+from .tinyurl import TinyurlShortener
+from .xedcc import XedccShortener
+from .clckru import ClckruShortener
+__all__ = ["HKCShortener", "IsgdShortener", "OnjmeShortener", "TinyArrowsShortener", "TinyurlShortener", "XedccShortener", "ClckruShortener"]

src/url_shortener/shorteners/clckru.py

@@ -1,20 +1,21 @@
-import urllib
-
-from url_shortener import URLShortener
-
-
-class ClckruShortener (URLShortener):
- def __init__ (self, *args, **kwargs):
-  self.name = "clck.ru"
-  return super(ClckruShortener, self).__init__(*args, **kwargs)
-
- def _shorten (self, url):
-  answer = url
-  api = urllib.urlopen ("http://clck.ru/--?url=" + urllib.quote(url))
-  if api.getcode() == 200:
-   answer = api.read()
-  api.close()
-  return answer
-
- def created_url (self, url):
-  return 'clck.ru' in url
+from __future__ import absolute_import
+import urllib
+
+from .url_shortener import URLShortener
+
+
+class ClckruShortener (URLShortener):
+ def __init__ (self, *args, **kwargs):
+  self.name = "clck.ru"
+  return super(ClckruShortener, self).__init__(*args, **kwargs)
+
+ def _shorten (self, url):
+  answer = url
+  api = urllib.urlopen ("http://clck.ru/--?url=" + urllib.quote(url))
+  if api.getcode() == 200:
+   answer = api.read()
+  api.close()
+  return answer
+
+ def created_url (self, url):
+  return 'clck.ru' in url

src/url_shortener/shorteners/hkcim.py

@@ -1,19 +1,20 @@
-import urllib
-
-from url_shortener import URLShortener
-
-class HKCShortener (URLShortener):
- def __init__ (self, *args, **kwargs):
-  self.name = "HKC.im"
-  super(HKCShortener, self).__init__(*args, **kwargs)
-
- def _shorten (self, url):
-  answer = url
-  api = urllib.urlopen ("http://hkc.im/yourls-api.php?action=shorturl&format=simple&url=" + urllib.quote(url))
-  if api.getcode() == 200:
-   answer = api.read()
-  api.close()
-  return answer
-
- def created_url (self, url):
-  return 'hkc.im' in url.lower()
+from __future__ import absolute_import
+import urllib
+
+from .url_shortener import URLShortener
+
+class HKCShortener (URLShortener):
+ def __init__ (self, *args, **kwargs):
+  self.name = "HKC.im"
+  super(HKCShortener, self).__init__(*args, **kwargs)
+
+ def _shorten (self, url):
+  answer = url
+  api = urllib.urlopen ("http://hkc.im/yourls-api.php?action=shorturl&format=simple&url=" + urllib.quote(url))
+  if api.getcode() == 200:
+   answer = api.read()
+  api.close()
+  return answer
+
+ def created_url (self, url):
+  return 'hkc.im' in url.lower()

src/url_shortener/shorteners/isgd.py

@@ -1,20 +1,21 @@
-import urllib
-
-from url_shortener import URLShortener
-
-
-class IsgdShortener (URLShortener):
- def __init__ (self, *args, **kwargs):
-  self.name = "Is.gd"
-  return super(IsgdShortener, self).__init__(*args, **kwargs)
-
- def _shorten (self, url):
-  answer = url
-  api = urllib.urlopen ("http://is.gd/api.php?longurl=" + urllib.quote(url))
-  if api.getcode() == 200:
-   answer = api.read()
-  api.close()
-  return answer
-
- def created_url (self, url):
-  return 'is.gd' in url
+from __future__ import absolute_import
+import urllib
+
+from .url_shortener import URLShortener
+
+
+class IsgdShortener (URLShortener):
+ def __init__ (self, *args, **kwargs):
+  self.name = "Is.gd"
+  return super(IsgdShortener, self).__init__(*args, **kwargs)
+
+ def _shorten (self, url):
+  answer = url
+  api = urllib.urlopen ("http://is.gd/api.php?longurl=" + urllib.quote(url))
+  if api.getcode() == 200:
+   answer = api.read()
+  api.close()
+  return answer
+
+ def created_url (self, url):
+  return 'is.gd' in url

src/url_shortener/shorteners/onjme.py

@@ -1,19 +1,20 @@
-import urllib
-
-from url_shortener import URLShortener
-
-class OnjmeShortener (URLShortener):
- def __init__ (self, *args, **kwargs):
-  self.name = "Onj.me"
-  super(OnjmeShortener, self).__init__(*args, **kwargs)
-
- def _shorten (self, url):
-  answer = url
-  api = urllib.urlopen ("http://onj.me/yourls-api.php?action=shorturl&format=simple&url=" + urllib.quote(url))
-  if api.getcode() == 200:
-   answer = api.read()
-  api.close()
-  return answer
-
- def created_url (self, url):
-  return 'onj.me' in url.lower()
+from __future__ import absolute_import
+import urllib
+
+from .url_shortener import URLShortener
+
+class OnjmeShortener (URLShortener):
+ def __init__ (self, *args, **kwargs):
+  self.name = "Onj.me"
+  super(OnjmeShortener, self).__init__(*args, **kwargs)
+
+ def _shorten (self, url):
+  answer = url
+  api = urllib.urlopen ("http://onj.me/yourls-api.php?action=shorturl&format=simple&url=" + urllib.quote(url))
+  if api.getcode() == 200:
+   answer = api.read()
+  api.close()
+  return answer
+
+ def created_url (self, url):
+  return 'onj.me' in url.lower()

src/url_shortener/shorteners/tinyarrows.py

@@ -1,16 +1,17 @@
-import urllib
-
-from url_shortener import URLShortener
-
-class TinyArrowsShortener (URLShortener):
- def __init__ (self, *args, **kwargs):
-  self.name = "TinyArro.ws"
-  super(TinyArrowsShortener, self).__init__(*args, **kwargs)
-
- def _shorten (self, url):
-  answer = url
-  answer = urllib.urlopen("http://tinyarro.ws/api-create.php?utfpure=1&url=%s" % urllib.quote(url)).read()
-  return answer.decode('UTF-8')
-
- def created_url(self, url):
-  return False
+from __future__ import absolute_import
+import urllib
+
+from .url_shortener import URLShortener
+
+class TinyArrowsShortener (URLShortener):
+ def __init__ (self, *args, **kwargs):
+  self.name = "TinyArro.ws"
+  super(TinyArrowsShortener, self).__init__(*args, **kwargs)
+
+ def _shorten (self, url):
+  answer = url
+  answer = urllib.urlopen("http://tinyarro.ws/api-create.php?utfpure=1&url=%s" % urllib.quote(url)).read()
+  return answer.decode('UTF-8')
+
+ def created_url(self, url):
+  return False

src/url_shortener/shorteners/tinyurl.py

@@ -1,18 +1,19 @@
-from url_shortener import URLShortener
-import urllib
-class TinyurlShortener (URLShortener):
- def __init__(self, *args, **kwargs):
-  self.name = "TinyURL.com"
-  super(TinyurlShortener, self).__init__(*args, **kwargs)
-
- def _shorten (self, url):
-
-  answer = url
-  api = urllib.urlopen ("http://tinyurl.com/api-create.php?url=" + urllib.quote(url))
-  if api.getcode() == 200:
-   answer = api.read()
-  api.close()
-  return answer
-
- def created_url (self, url):
-  return 'tinyurl.com' in url
+from __future__ import absolute_import
+from .url_shortener import URLShortener
+import urllib
+class TinyurlShortener (URLShortener):
+ def __init__(self, *args, **kwargs):
+  self.name = "TinyURL.com"
+  super(TinyurlShortener, self).__init__(*args, **kwargs)
+
+ def _shorten (self, url):
+
+  answer = url
+  api = urllib.urlopen ("http://tinyurl.com/api-create.php?url=" + urllib.quote(url))
+  if api.getcode() == 200:
+   answer = api.read()
+  api.close()
+  return answer
+
+ def created_url (self, url):
+  return 'tinyurl.com' in url

src/url_shortener/shorteners/url_shortener.py

@@ -1,33 +1,33 @@
-from httplib import HTTPConnection
-from urlparse import urlparse
-
-
-class URLShortener (object):
-
- def __init__ (self, *args, **kwargs):
-  #Stub out arguments, silly object. :(
-  return super(URLShortener, self).__init__()
-
- def shorten (self, url):
-  if self.created_url(url):
-   return url
-  else:
-   return self._shorten(url)
-
- def _shorten (self, url):
-  raise NotImplementedError
-
- def created_url (self, url):
-  """Returns a boolean indicating whether or not this shortener created a provided url"""
-  raise NotImplementedError
-
- def unshorten(self, url):
-  working = urlparse(url)
-  if not working.netloc:
-   raise TypeError, "Unable to parse URL."
-  con = HTTPConnection(working.netloc)
-  con.connect()
-  con.request('GET', working.path)
-  resp = con.getresponse()
-  con.close()
-  return resp.getheader('location')
+from httplib import HTTPConnection
+from urlparse import urlparse
+
+
+class URLShortener (object):
+
+ def __init__ (self, *args, **kwargs):
+  #Stub out arguments, silly object. :(
+  return super(URLShortener, self).__init__()
+
+ def shorten (self, url):
+  if self.created_url(url):
+   return url
+  else:
+   return self._shorten(url)
+
+ def _shorten (self, url):
+  raise NotImplementedError
+
+ def created_url (self, url):
+  """Returns a boolean indicating whether or not this shortener created a provided url"""
+  raise NotImplementedError
+
+ def unshorten(self, url):
+  working = urlparse(url)
+  if not working.netloc:
+   raise TypeError("Unable to parse URL.")
+  con = HTTPConnection(working.netloc)
+  con.connect()
+  con.request('GET', working.path)
+  resp = con.getresponse()
+  con.close()
+  return resp.getheader('location')

src/url_shortener/shorteners/xedcc.py

@@ -1,19 +1,20 @@
-import urllib
-
-from url_shortener import URLShortener
-
-class XedccShortener (URLShortener):
- def __init__ (self, *args, **kwargs):
-  self.name = "Xed.cc"
-  super(XedccShortener, self).__init__(*args, **kwargs)
-
- def _shorten (self, url):
-  answer = url
-  api = urllib.urlopen ("http://xed.cc/yourls-api.php?action=shorturl&format=simple&url=" + urllib.quote(url))
-  if api.getcode() == 200:
-   answer = api.read()
-  api.close()
-  return answer
-
- def created_url (self, url):
-  return 'xed.cc' in url.lower()
+from __future__ import absolute_import
+import urllib
+
+from .url_shortener import URLShortener
+
+class XedccShortener (URLShortener):
+ def __init__ (self, *args, **kwargs):
+  self.name = "Xed.cc"
+  super(XedccShortener, self).__init__(*args, **kwargs)
+
+ def _shorten (self, url):
+  answer = url
+  api = urllib.urlopen ("http://xed.cc/yourls-api.php?action=shorturl&format=simple&url=" + urllib.quote(url))
+  if api.getcode() == 200:
+   answer = api.read()
+  api.close()
+  return answer
+
+ def created_url (self, url):
+  return 'xed.cc' in url.lower()