Ubuntu One Client

Merge lp:~diegosarmentero/ubuntuone-client/menulucid into lp:ubuntuone-client

  1. menulucid
  2. Merge into trunk
Proposed by Diego Sarmentero on 2012-10-11
Status: Merged
Approved by: Facundo Batista on 2012-10-11
Approved revision: 1342
Merged at revision: 1339
Proposed branch: lp:~diegosarmentero/ubuntuone-client/menulucid
Merge into: lp:ubuntuone-client
Diff against target: 56 lines (+13/-4)
2 files modified
tests/platform/sync_menu/test_linux.py (+1/-0)
ubuntuone/platform/sync_menu/linux.py (+12/-4)
To merge this branch: bzr merge lp:~diegosarmentero/ubuntuone-client/menulucid
Reviewer Review Type Date Requested Status
Facundo Batista Approve on 2012-10-11
Roberto Alsina (community) 2012-10-11 Approve on 2012-10-11
Review via email: mp+129169@code.launchpad.net

Commit Message

- Fixed backwards compatibilites.

To post a comment you must log in.
Roberto Alsina (ralsina) :
review: Approve
lp:~diegosarmentero/ubuntuone-client/menulucid updated on 2012-10-11
1340. By Diego Sarmentero on 2012-10-11

adding one line space

1341. By Diego Sarmentero on 2012-10-11

improve TransfersMenu declaration to avoid problems

1342. By Diego Sarmentero on 2012-10-11

fixing OrderedDict

Roberto Alsina (ralsina) :
review: Approve
Facundo Batista (facundo) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/platform/sync_menu/test_linux.py'
2--- tests/platform/sync_menu/test_linux.py 2012-10-10 14:54:49 +0000
3+++ tests/platform/sync_menu/test_linux.py 2012-10-11 13:02:21 +0000
4@@ -124,6 +124,7 @@
5 """Check that the dummy has the proper methods required by the API."""
6 dummy = linux.DummySyncMenu('random', 'args')
7 self.assertIsInstance(dummy.update_transfers, Callable)
8+ self.assertIsInstance(dummy.sync_status_changed, Callable)
9
10
11 class SyncMenuTestCase(TestCase):
12
13=== modified file 'ubuntuone/platform/sync_menu/linux.py'
14--- ubuntuone/platform/sync_menu/linux.py 2012-10-10 17:06:14 +0000
15+++ ubuntuone/platform/sync_menu/linux.py 2012-10-11 13:02:21 +0000
16@@ -183,7 +183,7 @@
17 self.timer.addCallback(self._timeout)
18
19
20-class TransfersMenu(Dbusmenu.Menuitem):
21+class TransfersMenu(Dbusmenu.Menuitem if use_syncmenu else object):
22 """Menu that handles the recent and current transfers."""
23
24 def __init__(self, status_frontend):
25@@ -227,7 +227,7 @@
26 items_added = 0
27 remove = []
28 for item in self._uploading_items:
29- if item in uploading_data:
30+ if item in uploading_data.keys():
31 size, written = uploading_data[item]
32 percentage = written * 100 / size
33 upload_item = self._uploading_items[item]
34@@ -243,7 +243,7 @@
35 for item in remove:
36 self._uploading_items.pop(item)
37 if items_added < 5:
38- for item in uploading_data:
39+ for item in uploading_data.keys():
40 if item not in self._uploading_items and items_added < 5:
41 size, written = uploading_data[item]
42 percentage = written * 100 / size
43@@ -270,4 +270,12 @@
44 def update_transfers(self):
45 """Do nothing."""
46
47-UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux if use_syncmenu else DummySyncMenu
48+ def sync_status_changed(self):
49+ """Do nothing."""
50+
51+
52+if use_syncmenu:
53+ UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux
54+else:
55+ UbuntuOneSyncMenu = DummySyncMenu
56+ TransfersMenu = None

Subscribers

People subscribed via source and target branches