Merge lp:~diegosarmentero/ubuntuone-control-panel/unicode-syncing-error into lp:ubuntuone-control-panel

Proposed by Diego Sarmentero on 2012-03-29
Status: Merged
Approved by: dobey on 2012-04-02
Approved revision: 303
Merged at revision: 308
Proposed branch: lp:~diegosarmentero/ubuntuone-control-panel/unicode-syncing-error
Merge into: lp:ubuntuone-control-panel
Diff against target: 38 lines (+3/-3)
3 files modified
ubuntuone/controlpanel/gui/__init__.py (+1/-1)
ubuntuone/controlpanel/utils/tests/test_windows.py (+1/-1)
ubuntuone/controlpanel/utils/windows.py (+1/-1)
To merge this branch: bzr merge lp:~diegosarmentero/ubuntuone-control-panel/unicode-syncing-error
Reviewer Review Type Date Requested Status
dobey (community) Approve on 2012-04-02
Natalia Bidart 2012-03-29 Approve on 2012-03-29
Review via email: mp+99990@code.launchpad.net

Commit message

- Removing encoding to return unicode (LP: #966513).

To post a comment you must log in.
Natalia Bidart (nataliabidart) wrote :

Looks good!

review: Approve
dobey (dobey) wrote :

Can you please commit --fixes= for the bug?

review: Needs Fixing
Diego Sarmentero (diegosarmentero) wrote :

> Can you please commit --fixes= for the bug?

Done

303. By Diego Sarmentero on 2012-03-30

Adding bug number

dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
2--- ubuntuone/controlpanel/gui/__init__.py 2012-03-20 15:11:56 +0000
3+++ ubuntuone/controlpanel/gui/__init__.py 2012-03-30 20:06:19 +0000
4@@ -204,7 +204,7 @@
5 MAIN_PREFERENCES_TAB = _('Settings')
6 MAIN_WINDOW_TITLE = _('%(app_name)s Control Panel')
7 MUSIC_DISPLAY_NAME = _('Purchased Music')
8-MUSIC_REAL_PATH = '.ubuntuone/Purchased from Ubuntu One'
9+MUSIC_REAL_PATH = u'.ubuntuone/Purchased from Ubuntu One'
10 MY_FOLDERS = _('My folders')
11 NAME_NOT_SET = _('[unknown user name]')
12 NETWORK_OFFLINE = _('An internet connection is required to join or sign '
13
14=== modified file 'ubuntuone/controlpanel/utils/tests/test_windows.py'
15--- ubuntuone/controlpanel/utils/tests/test_windows.py 2012-03-30 17:34:33 +0000
16+++ ubuntuone/controlpanel/utils/tests/test_windows.py 2012-03-30 20:06:19 +0000
17@@ -220,7 +220,7 @@
18 for name in names:
19 name = getattr(utils.windows.shellcon, 'CSIDL_%s' % name)
20 folder = utils.windows.shell.SHGetFolderPath(0, name, None, 0)
21- expected.append(folder.encode('utf8'))
22+ expected.append(folder)
23
24 self.assertEqual(sorted(folders), sorted(expected))
25
26
27=== modified file 'ubuntuone/controlpanel/utils/windows.py'
28--- ubuntuone/controlpanel/utils/windows.py 2012-03-30 17:34:33 +0000
29+++ ubuntuone/controlpanel/utils/windows.py 2012-03-30 20:06:19 +0000
30@@ -95,7 +95,7 @@
31 # but the latter does not support XP
32 # (Minimum supported client: Windows Vista)
33 get_path = lambda name: shell.SHGetFolderPath(
34- 0, getattr(shellcon, name), None, 0).encode('utf8')
35+ 0, getattr(shellcon, name), None, 0)
36
37 folders = []
38 # More information on these constants at

Subscribers

People subscribed via source and target branches