Merge lp:~gary-lasker/software-center/fix-new-pep8-precise-fix into lp:software-center

Proposed by Gary Lasker
Status: Merged
Merged at revision: 3102
Proposed branch: lp:~gary-lasker/software-center/fix-new-pep8-precise-fix
Merge into: lp:software-center
Diff against target: 20 lines (+2/-2)
1 file modified
softwarecenter/backend/weblive_pristine.py (+2/-2)
To merge this branch: bzr merge lp:~gary-lasker/software-center/fix-new-pep8-precise-fix
Reviewer Review Type Date Requested Status
Michael Vogt Approve
Review via email: mp+120047@code.launchpad.net

Commit message

 * lp:~gary-lasker/software-center/fix-new-pep8-precise-fix:
   - small fix to allow trunk to continue to run on Precise

Description of the change

This is a simple branch that allows latest trunk to run on Precise again (one of the quantal pep8 fixes caused a crash in the weblive code when running on precise). I realize that the code in trunk is no longer targeted for precise but it's worthwhile to keep it running there for as long as we can manage it.

To post a comment you must log in.
Michael Vogt (mvo) wrote :

Thanks, nice find.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwarecenter/backend/weblive_pristine.py'
2--- softwarecenter/backend/weblive_pristine.py 2012-08-07 13:23:49 +0000
3+++ softwarecenter/backend/weblive_pristine.py 2012-08-17 03:38:19 +0000
4@@ -165,7 +165,7 @@
5 query['action'] = 'list_everything'
6 reply = self.do_query(query)
7
8- if not isinstance(reply['message'], {}):
9+ if not isinstance(reply['message'], dict):
10 raise WebLiveError("Invalid value, expected '%s' and got '%s'."
11 % (type({}), type(reply['message'])))
12
13@@ -236,7 +236,7 @@
14 query['action'] = 'list_servers'
15 reply = self.do_query(query)
16
17- if isinstance(reply['message'], {}):
18+ if isinstance(reply['message'], dict):
19 raise WebLiveError("Invalid value, expected '%s' and got '%s'."
20 % (type({}), type(reply['message'])))
21

Subscribers

People subscribed via source and target branches