Gwibber

Merge lp:~bigwhale/gwibber/fix-946049 into lp:gwibber

  1. fix-946049
  2. Merge into trunk
Proposed by David Klasinc
Status: Merged
Merged at revision: 1312
Proposed branch: lp:~bigwhale/gwibber/fix-946049
Merge into: lp:gwibber
Diff against target: 17 lines (+5/-2)
1 file modified
gwibber/microblog/network.py (+5/-2)
To merge this branch: bzr merge lp:~bigwhale/gwibber/fix-946049
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+97098@code.launchpad.net

Description of the change

Added additional error handling to UrlLib2Downloader.

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks great, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gwibber/microblog/network.py'
2--- gwibber/microblog/network.py 2012-02-10 10:06:59 +0000
3+++ gwibber/microblog/network.py 2012-03-12 20:41:20 +0000
4@@ -33,8 +33,11 @@
5 try:
6 self.res = urllib2.urlopen(req)
7 except urllib2.HTTPError, e:
8- logger.error("Network failure for %s - error code: %s", e.geturl().split("?")[0], e.getcode())
9- self.res = "Network error: {0}".format(e.getcode())
10+ logger.error("HTTP Error for %s - error code: %s", e.geturl().split("?")[0], e.getcode())
11+ self.res = "HTTP error: {0}".format(e.getcode())
12+ except urllib2.URLError, e:
13+ logger.error("Network failure: %s", e.reason)
14+ self.res = "Network error: {0}".format(e.reason)
15
16 def get_json(self):
17 try: