Fixed issue with url shorteners. Should help to fix #159

src/sound.py

@@ -95,7 +95,7 @@ class soundSystem(object):
   sound_object.play()
 
 class URLStream(object):
- def __init__(self,url=None):
+ def __init__(self, url=None):
   self.url = url
   self.prepared = False
   log.debug("URL Player initialized")
@@ -115,7 +115,6 @@ class URLStream(object):
    log.debug("Transformed URL: %s. Prepared" % (self.url,))
    self.prepared = True
 
-
  def seek(self,step):
   pos=self.stream.get_position()
   pos=self.stream.bytes_to_seconds(pos)
@@ -145,7 +144,6 @@ class URLStream(object):
    self.stream.volume = float(volume)
    self.stream.play()
    log.debug("played")
-#   call_threaded(self.delete_when_done)
 
  def stop_audio(self,delete=False):
   if hasattr(self, "stream"):

src/url_shortener/shorteners/url_shortener.py

@@ -20,8 +20,4 @@ class URLShortener (object):
   raise NotImplementedError
 
  def unshorten(self, url):
-  try:
-   r=requests.get(url)
-   return r.url
-  except:
-   return url #we cannot expand
+  return url