Merge lp:~robru/gwibber/3.4-twitter-1.1 into lp:gwibber/3.4

Proposed by Robert Bruce Park
Status: Merged
Approved by: Ken VanDine
Approved revision: 1323
Merged at revision: 1322
Proposed branch: lp:~robru/gwibber/3.4-twitter-1.1
Merge into: lp:gwibber/3.4
Diff against target: 43 lines (+4/-4)
2 files modified
gwibber/microblog/plugins/twitter/__init__.py (+1/-1)
gwibber/microblog/plugins/twitter/gtk/twitter/__init__.py (+3/-3)
To merge this branch: bzr merge lp:~robru/gwibber/3.4-twitter-1.1
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+171193@code.launchpad.net

Commit message

Switch to Twitter v1.1 as v1 has been retired.

To post a comment you must log in.
lp:~robru/gwibber/3.4-twitter-1.1 updated
1323. By Robert Bruce Park

Get the other v1 API URL too.

Revision history for this message
Ken VanDine (ken-vandine) wrote :

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'gwibber/microblog/plugins/twitter/__init__.py'
--- gwibber/microblog/plugins/twitter/__init__.py 2012-03-30 14:32:20 +0000
+++ gwibber/microblog/plugins/twitter/__init__.py 2013-06-25 01:25:31 +0000
@@ -57,7 +57,7 @@
57}57}
5858
59URL_PREFIX = "https://twitter.com"59URL_PREFIX = "https://twitter.com"
60API_PREFIX = "https://api.twitter.com/1"60API_PREFIX = "https://api.twitter.com/1.1"
6161
62class Client ():62class Client ():
63 def __init__(self, acct):63 def __init__(self, acct):
6464
=== modified file 'gwibber/microblog/plugins/twitter/gtk/twitter/__init__.py'
--- gwibber/microblog/plugins/twitter/gtk/twitter/__init__.py 2012-03-07 21:17:19 +0000
+++ gwibber/microblog/plugins/twitter/gtk/twitter/__init__.py 2013-06-25 01:25:31 +0000
@@ -17,7 +17,7 @@
17class AccountWidget(Gtk.VBox):17class AccountWidget(Gtk.VBox):
18 """AccountWidget: A widget that provides a user interface for configuring twitter accounts in Gwibber18 """AccountWidget: A widget that provides a user interface for configuring twitter accounts in Gwibber
19 """19 """
20 20
21 def __init__(self, account=None, dialog=None):21 def __init__(self, account=None, dialog=None):
22 """Creates the account pane for configuring Twitter accounts"""22 """Creates the account pane for configuring Twitter accounts"""
23 Gtk.VBox.__init__( self, False, 20 )23 Gtk.VBox.__init__( self, False, 20 )
@@ -141,7 +141,7 @@
141 apireq = oauth.OAuthRequest.from_consumer_and_token(141 apireq = oauth.OAuthRequest.from_consumer_and_token(
142 self.consumer, atok,142 self.consumer, atok,
143 http_method="GET",143 http_method="GET",
144 http_url="http://api.twitter.com/1/account/verify_credentials.json", parameters=None)144 http_url="http://api.twitter.com/1.1/account/verify_credentials.json", parameters=None)
145145
146 apireq.sign_request(sigmeth, self.consumer, atok)146 apireq.sign_request(sigmeth, self.consumer, atok)
147147
@@ -161,7 +161,7 @@
161 self.dialog.infobar.set_message_type(Gtk.MessageType.ERROR)161 self.dialog.infobar.set_message_type(Gtk.MessageType.ERROR)
162 message_label.set_text(_("Authorization failed. Please try again."))162 message_label.set_text(_("Authorization failed. Please try again."))
163163
164 if saved: 164 if saved:
165 message_label.set_text(_("Successful"))165 message_label.set_text(_("Successful"))
166 self.dialog.infobar.set_message_type(Gtk.MessageType.INFO)166 self.dialog.infobar.set_message_type(Gtk.MessageType.INFO)
167 #self.dialog.infobar.hide()167 #self.dialog.infobar.hide()

Subscribers

People subscribed via source and target branches