Merge lp://qastaging/~mandel/desktopcouch/add_windows_keyring_import into lp://qastaging/desktopcouch

Proposed by Manuel de la Peña
Status: Merged
Approved by: Vincenzo Di Somma
Approved revision: 258
Merged at revision: 255
Proposed branch: lp://qastaging/~mandel/desktopcouch/add_windows_keyring_import
Merge into: lp://qastaging/desktopcouch
Diff against target: 262 lines (+232/-1)
4 files modified
desktopcouch/application/platform/__init__.py (+5/-1)
desktopcouch/application/platform/windows/base_dirs.py (+108/-0)
desktopcouch/application/platform/windows/keyring.py (+30/-0)
desktopcouch/application/platform/windows/tests/test_base_dirs.py (+89/-0)
To merge this branch: bzr merge lp://qastaging/~mandel/desktopcouch/add_windows_keyring_import
Reviewer Review Type Date Requested Status
Vincenzo Di Somma (community) Approve
Eric Casteleijn (community) Approve
Review via email: mp+45526@code.qastaging.launchpad.net

Commit message

Added the correct import of the keyring on windows to fix lp:699766
Added implementation for the base dirs on windows to fix lp:699818

Description of the change

Added the correct import of the keyring on windows to fix lp:699766
Added implementation for the base dirs on windows to fix lp:699818

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

looking good.

review: Approve
258. By Manuel de la Peña

Made illegal chars loop more elegant.

Revision history for this message
Vincenzo Di Somma (vds) :
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