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

Proposed by Colin Dean on 2010-06-23
Status: Merged
Merged at revision: 829
Proposed branch: lp:~colindean/gwibber/bug583316-remove-tr.im
Merge into: lp:gwibber
Diff against target: 47 lines (+1/-26)
2 files modified
gwibber/microblog/urlshorter/__init__.py (+1/-2)
gwibber/microblog/urlshorter/trim.py (+0/-24)
To merge this branch: bzr merge lp:~colindean/gwibber/bug583316-remove-tr.im
Reviewer Review Type Date Requested Status
gwibber-committers 2010-06-23 Pending
Review via email: mp+28314@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gwibber/microblog/urlshorter/__init__.py'
2--- gwibber/microblog/urlshorter/__init__.py 2009-04-15 22:56:03 +0000
3+++ gwibber/microblog/urlshorter/__init__.py 2010-06-23 18:35:11 +0000
4@@ -1,5 +1,5 @@
5
6-import cligs, isgd, tinyurlcom, trim, ur1ca
7+import cligs, isgd, tinyurlcom, ur1ca
8 #import snipurlcom, zima
9
10 PROTOCOLS = {
11@@ -7,7 +7,6 @@
12 "is.gd": isgd,
13 #"snipurl.com": snipurlcom,
14 "tinyurl.com": tinyurlcom,
15- "tr.im": trim,
16 "ur1.ca": ur1ca,
17 #"zi.ma": zima,
18 }
19
20=== removed file 'gwibber/microblog/urlshorter/trim.py'
21--- gwibber/microblog/urlshorter/trim.py 2009-02-14 16:10:22 +0000
22+++ gwibber/microblog/urlshorter/trim.py 1970-01-01 00:00:00 +0000
23@@ -1,24 +0,0 @@
24-
25-"""
26-
27-tr.im interface for Gwibber
28-macno (Michele Azzolari) - 02/13/2008
29-
30-"""
31-
32-import urllib2
33-
34-PROTOCOL_INFO = {
35-
36- "name": "tr.im",
37- "version": 0.1,
38- "fqdn" : "http://tr.im",
39-
40-}
41-
42-class URLShorter:
43-
44- def short(self, text):
45- short = urllib2.urlopen("http://tr.im/api/trim_simple?url=%s" % urllib2.quote(text)).read().rstrip("\n")
46- return short
47-

Subscribers

People subscribed via source and target branches