Allow expand() to expand any tiny url by defaulting to get_redirect()

joshthecoder · joshthecoder · commit 0f2f6c0f4ecc · 2009-07-24T20:24:04.000-05:00
if the service implementation is missing or does not implement expand().
diff --git a/README b/README
@@ -8,7 +8,7 @@
 
 Access many URL shortening services from one library.
 
-Supported URL shortening services:
+Supported URL shortening services for shrinking long urls:
     sandbox (stored locally in memory for testing)
     tinyurl.com
     tr.im
@@ -18,6 +18,11 @@ Supported URL shortening services:
     cli.gs
     twurl.nl (tweetburner)
 
+Shorty can expand any url service by getting the redirect
+location by requesting the tiny url.
+
+See example.py for a demo of using this library.
+
 Language: Python
 Website: http://gitorious.org/shorty
 Repository: git://gitorious.org/shorty/python.git
@@ -30,4 +35,3 @@ Install:
     If using a version of python before 2.6 you will also need
     to have simplejson installed.
 
-See example.py for a demo of using this library.
diff --git a/shorty.py b/shorty.py
@@ -346,8 +346,8 @@ def shrink(service_domain, bigurl, *args, **kargs):
     return s.shrink(bigurl, *args, **kargs)
     
 """
-Auto detect service and expand the tiny url.
-Returns the expanded url or None if service not supported.
+Expand tiny url into its full url.
+Returns long url if successful or None if failure.
 """
 def expand(tinyurl):
 
@@ -358,7 +358,6 @@ def expand(tinyurl):
         domain = domain[4:]
     s = services.get(domain)
     if not s:
-        # service not supported
-        return None
+        return get_redirect(tinyurl)
     return s.expand(tinyurl)
 
