Merge lp:~colindean/gwibber/bug583316-remove-tr.im into lp:gwibber

[Colin Dean]

Removes gwibber/microblog/urlshorter/trim.py and references to it in gwibber.microblog.urlshorter

=== modified file 'gwibber/microblog/urlshorter/__init__.py'
--- gwibber/microblog/urlshorter/__init__.py	2009-04-15 22:56:03 +0000
+++ gwibber/microblog/urlshorter/__init__.py	2010-06-23 18:35:11 +0000
@@ -1,5 +1,5 @@
 
-import cligs, isgd, tinyurlcom, trim, ur1ca
+import cligs, isgd, tinyurlcom, ur1ca
 #import snipurlcom, zima
 
 PROTOCOLS = {
@@ -7,7 +7,6 @@
   "is.gd": isgd,
   #"snipurl.com": snipurlcom,
   "tinyurl.com": tinyurlcom,
-  "tr.im": trim,
   "ur1.ca": ur1ca,
   #"zi.ma": zima,
 }
 
=== removed file 'gwibber/microblog/urlshorter/trim.py'
--- gwibber/microblog/urlshorter/trim.py	2009-02-14 16:10:22 +0000
+++ gwibber/microblog/urlshorter/trim.py	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-
-"""
-
-tr.im interface for Gwibber
-macno (Michele Azzolari) - 02/13/2008
-
-"""
-
-import urllib2
-
-PROTOCOL_INFO = {
-
-  "name": "tr.im",
-  "version": 0.1,
-  "fqdn" : "http://tr.im",
-  
-}
-
-class URLShorter:
-
-  def short(self, text):
-    short = urllib2.urlopen("http://tr.im/api/trim_simple?url=%s" % urllib2.quote(text)).read().rstrip("\n")
-    return short
-