Merge lp:~facundo/ubuntuone-client/aq-slots into lp:ubuntuone-client

[Facundo Batista]

Assure all commands declare __slots__ (LP: #721483).

Assure all commands declare __slots__.

This is because even if you subclass a class that declares it, you will not inherit its particular behaviour.

Test included.

[dobey (dobey)]

review: Approve

[Facundo Batista (facundo)]

Approving with one review

review: Approve

=== modified file 'tests/syncdaemon/test_action_queue.py'
--- tests/syncdaemon/test_action_queue.py	2011-04-06 13:41:36 +0000
+++ tests/syncdaemon/test_action_queue.py	2011-04-07 21:17:29 +0000
@@ -56,6 +56,7 @@
     request,
 )
 from ubuntuone.syncdaemon import states, interfaces
+from ubuntuone.syncdaemon import action_queue
 from ubuntuone.syncdaemon.action_queue import (
     ActionQueue, ActionQueueCommand, ChangePublicAccess, CreateUDF,
     DeleteVolume, Download, ListVolumes, ActionQueueProtocol,
@@ -2081,6 +2082,16 @@
         self.assertFalse(called)
         self.assertTrue(self.cmd.cancelled)
 
+    def test_slots(self):
+        """Inherited commands must have __slot__ (that is not inherited)."""
+        for obj_name in dir(action_queue):
+            obj = getattr(action_queue, obj_name)
+            if isinstance(obj, type) and issubclass(obj, ActionQueueCommand) \
+               and obj is not ActionQueueCommand:
+                self.assertNotIdentical(obj.__slots__,
+                                        ActionQueueCommand.__slots__,
+                                        "class %s has no __slots__" % obj)
+
 
 class CreateUDFTestCase(ConnectedBaseTestCase):
     """Test for CreateUDF ActionQueueCommand."""
 
=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2011-04-06 13:41:36 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2011-04-07 21:17:29 +0000
@@ -1587,6 +1587,8 @@
 class FreeSpaceInquiry(ActionQueueCommand):
     """Inquire about free space."""
 
+    __slots__ = ()
+
     def __init__(self, request_queue, share_id):
         """Initialize the instance."""
         super(FreeSpaceInquiry, self).__init__(request_queue)
@@ -1611,6 +1613,8 @@
 class AccountInquiry(ActionQueueCommand):
     """Query user account information."""
 
+    __slots__ = ()
+
     def _run(self):
         """Make the actual request."""
         return self.action_queue.client.get_account_info()