Merge lp://qastaging/~cmiller/desktopcouch/fix-lint-fixes into lp://qastaging/desktopcouch

Proposed by Chad Miller
Status: Merged
Approved by: dobey
Approved revision: 239
Merged at revision: 238
Proposed branch: lp://qastaging/~cmiller/desktopcouch/fix-lint-fixes
Merge into: lp://qastaging/desktopcouch
Diff against target: 235 lines (+29/-35)
5 files modified
bin/desktopcouch-pair (+22/-28)
desktopcouch/application/platform/linux/__init__.py (+1/-1)
desktopcouch/application/replication.py (+2/-2)
desktopcouch/application/replication_services/__init__.py (+2/-2)
desktopcouch/application/replication_services/example.py (+2/-2)
To merge this branch: bzr merge lp://qastaging/~cmiller/desktopcouch/fix-lint-fixes
Reviewer Review Type Date Requested Status
dobey (community) Approve
Eric Casteleijn (community) Approve
Review via email: mp+43290@code.qastaging.launchpad.net

Commit message

Don't use deprecated import inside library. Fix damage from lint-fix marathon.

Fix wrong parameters on window closing in pairing tool.

To post a comment you must log in.
Revision history for this message
Eric Casteleijn (thisfred) wrote :

Awesome, sorry that I didn't catch these before.

review: Approve
Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches