Gwibber

Merge lp://staging/~colindean/gwibber/statusnet-identica-groups-lp364322 into lp://staging/gwibber

  1. statusnet-identica-groups-lp364322
  2. Merge into trunk
Proposed by Colin Dean
Status: Merged
Merge reported by: Ryan Paul
Merged at revision: not available
Proposed branch: lp://staging/~colindean/gwibber/statusnet-identica-groups-lp364322
Merge into: lp://staging/gwibber
Diff against target: 56 lines
3 files modified
gwibber/actions.py (+5/-0)
gwibber/microblog/identica.py (+7/-4)
gwibber/microblog/laconica.py (+4/-4)
To merge this branch: bzr merge lp://staging/~colindean/gwibber/statusnet-identica-groups-lp364322
Reviewer Review Type Date Requested Status
gwibber-committers Pending
Review via email: mp+13898@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Colin Dean (colindean) wrote :

I think I did the remerging correctly...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'gwibber/actions.py'
--- gwibber/actions.py 2009-09-24 15:06:26 +0000
+++ gwibber/actions.py 2009-10-24 17:10:23 +0000
@@ -133,6 +133,11 @@
133 @classmethod133 @classmethod
134 def action(self, w, client, query):134 def action(self, w, client, query):
135 print "Searching for tag", query135 print "Searching for tag", query
136
137class group(MessageAction):
138 @classmethod
139 def action(self, w, client, query):
140 print "Searching for group", query
136141
137class tomboy(MessageAction):142class tomboy(MessageAction):
138 icon = "tomboy"143 icon = "tomboy"
139144
=== modified file 'gwibber/microblog/identica.py'
--- gwibber/microblog/identica.py 2009-10-01 06:57:48 +0000
+++ gwibber/microblog/identica.py 2009-10-24 17:10:23 +0000
@@ -165,10 +165,13 @@
165 query}))))["entries"]165 query}))))["entries"]
166166
167 def get_group(self, query):167 def get_group(self, query):
168 return feedparser.parse(urllib2.urlopen(168 return simplejson.load(urllib2.urlopen(
169 urllib2.Request("https://identi.ca/index.php",169 urllib2.Request("http://identi.ca/api/statusnet/groups/timeline.json",
170 urllib.urlencode({"action": "grouprss", "nickname":170 urllib.urlencode({"id": query}))))["results"]
171 query}))))["entries"]171 #return feedparser.parse(urllib2.urlopen(
172 # urllib2.Request("https://identi.ca/index.php",
173 # urllib.urlencode({"action": "grouprss", "nickname":
174 # query}))))["entries"]
172175
173 def get_public_timeline(self):176 def get_public_timeline(self):
174 return simplejson.loads(self.connect(177 return simplejson.loads(self.connect(
175178
=== modified file 'gwibber/microblog/laconica.py'
--- gwibber/microblog/laconica.py 2009-09-21 22:56:53 +0000
+++ gwibber/microblog/laconica.py 2009-10-24 17:10:23 +0000
@@ -165,10 +165,10 @@
165 urllib.urlencode({"action": "tagrss", "tag": query}))))["entries"]165 urllib.urlencode({"action": "tagrss", "tag": query}))))["entries"]
166166
167 def get_group(self, query):167 def get_group(self, query):
168 return feedparser.parse(urllib2.urlopen(168 return simplejson.load(urllib2.urlopen(
169 urllib2.Request(self.url("/index.php"),169 urllib2.Request(self.url("/api/statusnet/groups/timeline.json"),
170 urllib.urlencode({"action": "grouprss", "nickname": query}))))["entries"]170 urllib.urlencode({"id": query}))))["results"]
171171
172 def search(self, query):172 def search(self, query):
173 for data in self.get_search(query):173 for data in self.get_search(query):
174 yield SearchResult(self, data, query)174 yield SearchResult(self, data, query)

Subscribers

People subscribed via source and target branches