Ubuntu One Client

Merge lp:~ralsina/ubuntuone-client/2-6-or-die into lp:ubuntuone-client

  1. 2-6-or-die
  2. Merge into trunk
Proposed by Roberto Alsina
Status: Merged
Approved by: Manuel de la Peña
Approved revision: 1338
Merged at revision: 1337
Proposed branch: lp:~ralsina/ubuntuone-client/2-6-or-die
Merge into: lp:ubuntuone-client
Diff against target: 12 lines (+1/-1)
1 file modified
ubuntuone/platform/sync_menu/linux.py (+1/-1)
To merge this branch: bzr merge lp:~ralsina/ubuntuone-client/2-6-or-die
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) Approve
Diego Sarmentero (community) Approve
Review via email: mp+128979@code.launchpad.net

Commit message

 - Switched to twisted's OrderedDict (Fixes lp:1064673 ).

Description of the change

This changes from python 2.7's OrderedDict to Twisted class of the same name, which seems to be equivalent for this usage.

To post a comment you must log in.
Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve
Revision history for this message
Manuel de la Peña (mandel) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/platform/sync_menu/linux.py'
2--- ubuntuone/platform/sync_menu/linux.py 2012-10-09 14:31:11 +0000
3+++ ubuntuone/platform/sync_menu/linux.py 2012-10-10 15:37:32 +0000
4@@ -33,7 +33,7 @@
5 import time
6 import sys
7 import webbrowser
8-from collections import OrderedDict
9+from twisted.python.util import OrderedDict
10 from operator import itemgetter
11
12 glib = None

Subscribers

People subscribed via source and target branches