runeh / urlunshort / changeset / e2169c4b70c6

 """Tools for exanding shortened URLs (from tinyurl/bit.ly/etc.) and
 detection if a URL has been shortened.
-"""
+"""Tools for detecting and expanding shortened URLs."""
-__version__ = "0.2"
+__version__ = "0.2.0"
 __author__ = "Rune Halvorsen <runefh@gmail.com>"
 __homepage__ = "http://bitbucket.org/runeh/urlunshort"
@@ -10,7 +8,7 @@ import urlparse
 from resolvers import generic_resolver
 # If some tiny url services require a special resolver, this mapping will
-# map between hostname -> resolver
+# map between hostname -> resolver (currently we have no custom resolvers)
 _resolver_map = {
+}
@@ -54,9 +52,9 @@ def resolve(url, timeout=None):
     return resolver(parts.netloc, parts.path, timeout)
 def is_shortened(url):
-    """Check if the url appears to be shortened, based on the services
+    """Check if the url appears to be shortened, based on the services
     whitelist. **Note:** This will be a best-effort thing, as the list
-    if services has to be kept up to date. Also note that valid URLs on
+    if services has to be kept up to date. Also note that valid URLs on
     shortening services (like bit.ly/apidocs) will be assumed to be a
     shortened url.
@@ -69,4 +67,4 @@ def is_shortened(url):
         # yes, I dknow about the default_scheme argument to ursplit,
         # and no, it doesn't actully work.
-    return parts.hostname in services and parts.path
+    return bool(parts.hostname in services and parts.path)