Merge lp://qastaging/~dobey/ubuntuone-control-panel/ign-new-pep8 into lp://qastaging/ubuntuone-control-panel
Proposed by
dobey
| Status: | Merged |
|---|---|
| Approved by: | dobey |
| Approved revision: | 385 |
| Merged at revision: | 384 |
| Proposed branch: | lp://qastaging/~dobey/ubuntuone-control-panel/ign-new-pep8 |
| Merge into: | lp://qastaging/ubuntuone-control-panel |
| Diff against target: |
191 lines (+30/-25) 9 files modified
run-tests (+1/-1) setup.py (+3/-3) ubuntuone/controlpanel/backend.py (+8/-4) ubuntuone/controlpanel/gui/qt/folders.py (+4/-4) ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+5/-5) ubuntuone/controlpanel/gui/qt/wizard.py (+3/-3) ubuntuone/controlpanel/gui/tests/__init__.py (+2/-2) ubuntuone/controlpanel/tests/test_backend.py (+2/-1) ubuntuone/controlpanel/utils/darwin.py (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~dobey/ubuntuone-control-panel/ign-new-pep8 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Diego Sarmentero (community) | Approve | ||
| Mike McCracken (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Ignore some of the new pep8 warnings, and fix some others
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1