Merge lp:~statik/ubuntuone-client/fix-lint into lp:ubuntuone-client

[Elliot Murphy]

Fix all lint warnings on lucid

[Elliot Murphy (statik)]

Fix all lint warnings on lucid. There is one change I wasn't sure about, it is commented in the diff.

[Rick McBride (rmcbride)]

YAY no more lint warnings on Lucid

review: Approve

[Eric Casteleijn (thisfred)]

+YAY!

review: Approve

=== modified file 'tests/syncdaemon/test_action_predicates.py'
--- tests/syncdaemon/test_action_predicates.py	2010-01-13 20:07:41 +0000
+++ tests/syncdaemon/test_action_predicates.py	2010-02-10 17:40:25 +0000
@@ -86,10 +86,10 @@
     def test_simple_commands(self):
         """Test command execution."""
         out = []
-        cmd = AppendCommand(self.request_queue,
-                            append_to=out, value="a").start()
-        cmd = AppendCommand(self.request_queue,
-                            append_to=out, value="b").start()
+        AppendCommand(self.request_queue,
+                      append_to=out, value="a").start()
+        AppendCommand(self.request_queue,
+                      append_to=out, value="b").start()
         self.request_queue.run()
         self.request_queue.run()
         self.assertEqual(["a", "b"], out)
 
=== modified file 'tests/syncdaemon/test_action_queue.py'
--- tests/syncdaemon/test_action_queue.py	2010-01-29 18:09:48 +0000
+++ tests/syncdaemon/test_action_queue.py	2010-02-10 17:40:25 +0000
@@ -360,7 +360,7 @@
 
         self.command.action_queue.client.create_udf = check
 
-        res = self.command._run()
+        self.command._run()
 
         self.assertTrue(self.called, 'command was called')
 
@@ -420,7 +420,7 @@
 
         self.command.action_queue.client.list_volumes = check
 
-        res = self.command._run()
+        self.command._run()
 
         self.assertTrue(self.called, 'command was called')
 
@@ -481,7 +481,7 @@
 
         self.command.action_queue.client.delete_volume = check
 
-        res = self.command._run()
+        self.command._run()
 
         self.assertTrue(self.called, 'command was called')
 
 
=== modified file 'tests/syncdaemon/test_dbus.py'
--- tests/syncdaemon/test_dbus.py	2010-02-04 18:04:41 +0000
+++ tests/syncdaemon/test_dbus.py	2010-02-10 17:40:25 +0000
@@ -1657,8 +1657,6 @@
     def test_create_server_error(self):
         """Test for Folders.create."""
         path = os.path.join(self.home_dir, u'ñoño')
-        id = uuid.uuid4()
-        node_id = uuid.uuid4()
         d = defer.Deferred()
         # patch AQ.create_udf
         def create_udf(path, name, marker):
@@ -1685,8 +1683,6 @@
     def test_create_client_error(self):
         """Test for Folders.create."""
         path = os.path.join(self.home_dir, u'ñoño')
-        id = uuid.uuid4()
-        node_id = uuid.uuid4()
         d = defer.Deferred()
         # patch AQ.create_udf
         def create_udf(path, name, marker):
@@ -1789,7 +1785,6 @@
         udf = self._create_udf(uuid.uuid4(), 'node_id', suggested_path,
                                subscribed=False)
         yield self.main.vm.add_udf(udf)
-        signal_deferred = defer.Deferred()
         d = defer.Deferred()
         def subscribe_handler(info):
             """FolderSubscribed handler."""
 
=== modified file 'tests/syncdaemon/test_eq_inotify.py'
--- tests/syncdaemon/test_eq_inotify.py	2010-02-08 19:24:06 +0000
+++ tests/syncdaemon/test_eq_inotify.py	2010-02-10 17:40:25 +0000
@@ -1165,7 +1165,6 @@
         fromfile = os.path.join(self.root_dir, "mdid.u1partial.foo")
         root_dir = os.path.join(self.root_dir, "my_files")
         tofile = os.path.join(root_dir, "foo")
-        mypath = functools.partial(os.path.join, root_dir)
         os.mkdir(root_dir)
         open(fromfile, "w").close()
         self.eq.add_to_mute_filter("FS_FILE_CREATE", tofile)
@@ -1366,7 +1365,6 @@
     def test_move_udf_ancestor(self):
         """UDF is unsubscribed on ancestor move."""
         original = self.eq.fs.vm.unsubscribe_udf
-        expected = []
         path = self.udf.ancestors[-2] # an ancestor common to both UDFs
         # generate IN_MOVED_FROM and IN_MOVED_TO
         newpath = path + u'.old'
@@ -1405,7 +1403,6 @@
     def test_move_udf_itself(self):
         """UDF is unsubscribed if renamed."""
         original = self.eq.fs.vm.unsubscribe_udf
-        expected = []
         newpath = self.udf.path + u'.old'
         os.rename(self.udf.path, newpath)
         assert os.path.exists(newpath)
 
=== modified file 'tests/syncdaemon/test_fileshelf.py'
--- tests/syncdaemon/test_fileshelf.py	2010-01-15 20:04:32 +0000
+++ tests/syncdaemon/test_fileshelf.py	2010-02-10 17:40:25 +0000
@@ -226,7 +226,7 @@
 
     def test_custom_unpickle(self):
         """Test the _pickle and _unpikle methods."""
-        path = self.mktemp('my_shelf')
+        self.mktemp('my_shelf')
         class InMemoryFileShelf(FileShelf):
             """A in-memory FileShelf."""
             values = {}
 
=== modified file 'tests/syncdaemon/test_fsm.py'
--- tests/syncdaemon/test_fsm.py	2010-01-26 19:46:37 +0000
+++ tests/syncdaemon/test_fsm.py	2010-02-10 17:40:25 +0000
@@ -1853,7 +1853,7 @@
         """Test that a dir is deleted, when is not empty and modified."""
         local_dir = os.path.join(self.root_dir, "foo")
         os.mkdir(local_dir)
-        mdid = self.fsm.create(local_dir, "", is_dir=True)
+        self.fsm.create(local_dir, "", is_dir=True)
         self.fsm.set_node_id(local_dir, "uuid")
 
         local_file = os.path.join(local_dir, "bar.txt")
@@ -1875,12 +1875,12 @@
 
         local_dir = os.path.join(self.root_dir, "foo")
         os.mkdir(local_dir)
-        mdid = self.fsm.create(local_dir, "", is_dir=True)
+        self.fsm.create(local_dir, "", is_dir=True)
         self.fsm.set_node_id(local_dir, "uuid")
 
         local_file = os.path.join(local_dir, "bar.txt")
         open(local_file, 'w').close() # touch bar.txt so it exists
-        mdid_file = self.fsm.create(local_file, "")
+        self.fsm.create(local_file, "")
         self.fsm.set_node_id(local_file, "uuid_file")
 
         self.fsm.delete_file(local_dir)
@@ -1898,7 +1898,7 @@
         log.read() # ignore log content till now
 
         local_dir = os.path.join(self.root_dir, "foo")
-        mdid = self.fsm.create(local_dir, "", is_dir=True)
+        self.fsm.create(local_dir, "", is_dir=True)
         self.fsm.set_node_id(local_dir, "uuid")
 
         # local_dir does not exist on the file system
@@ -2006,7 +2006,7 @@
         """Test the recursive changed feature for a non empty dir."""
         local_dir = os.path.join(self.root_dir, "foo")
         os.mkdir(local_dir)
-        mdid = self.fsm.create(local_dir, "", is_dir=True)
+        self.fsm.create(local_dir, "", is_dir=True)
         self.fsm.set_node_id(local_dir, "uuid")
 
         sub_dir = os.path.join(local_dir, "bar")
@@ -2707,11 +2707,11 @@
             if os.path.exists(d):
                 shutil.rmtree(d)
             os.mkdir(d)
-            mdid = self.fsm.create(d, '', is_dir=True)
+            self.fsm.create(d, '', is_dir=True)
             self.fsm.set_node_id(d, 'uuid')
 
         open(self.some_file, 'w').close()
-        mdid_file = self.fsm.create(self.some_file, "")
+        self.fsm.create(self.some_file, "")
         self.fsm.set_node_id(self.some_file, "uuid_file")
 
     def tearDown(self):
@@ -2737,7 +2737,7 @@
         """Check paths starting with excluding directories with same prefix."""
         similar_dir = os.path.join(self.root_dir, 'fooo')
         os.mkdir(similar_dir)
-        mdid = self.fsm.create(similar_dir, '', is_dir=True)
+        self.fsm.create(similar_dir, '', is_dir=True)
         self.fsm.set_node_id(similar_dir, 'uuid')
 
         expected = sorted([(self.some_dir, True), (self.sub_dir, True),
@@ -2759,15 +2759,15 @@
     def test_get_for_server_rescan_by_path(self):
         """Test FSM.get_for_server_rescan_by_path method"""
         # create the share fsm object
-        share_mdid = self.fsm.create(self.share_path, self.share.volume_id)
+        self.fsm.create(self.share_path, self.share.volume_id)
         self.fsm.set_node_id(self.share_path, "share_uuid")
         # create a few nodes
         path1 = os.path.join(self.share_path, "path1")
         path2 = os.path.join(self.share_path, "path1", "path2")
         path_out = os.path.join(self.root_dir, "path1")
-        mdid1 = self.fsm.create(path1, "share", is_dir=True)
-        mdid2 = self.fsm.create(path2, "share")
-        mdid_out = self.fsm.create(path_out, "")
+        self.fsm.create(path1, "share", is_dir=True)
+        self.fsm.create(path2, "share")
+        self.fsm.create(path_out, "")
         self.fsm.set_node_id(path1, "uuid1")
         self.fsm.set_node_id(path2, "uuid2")
         self.fsm.set_node_id(path_out, "uuid3")
 
=== modified file 'tests/syncdaemon/test_hashqueue.py'
--- tests/syncdaemon/test_hashqueue.py	2010-02-05 02:01:13 +0000
+++ tests/syncdaemon/test_hashqueue.py	2010-02-10 17:40:25 +0000
@@ -540,7 +540,6 @@
         hasher = content_hash_factory()
         hasher.hash_object.update(testinfo)
         testfile = os.path.join(self.test_dir, "testfile")
-        testhash = hasher.content_hash()
         # send what to hash
         with open(testfile, "w") as fh:
             fh.write(testinfo)
 
=== modified file 'tests/syncdaemon/test_localrescan.py'
--- tests/syncdaemon/test_localrescan.py	2010-02-09 14:21:08 +0000
+++ tests/syncdaemon/test_localrescan.py	2010-02-10 17:40:25 +0000
@@ -1679,8 +1679,8 @@
         """The file is created but never started to download."""
         # create the file in metadata
         path = os.path.join(self.share.path, "a")
-#        open(path, "w").close()
-        mdid = self.fsm.create(path, self.share.volume_id, is_dir=False, node_id="1")
+        # open(path, "w").close()
+        self.fsm.create(path, self.share.volume_id, is_dir=False, node_id="1")
 
         def check(_):
             """No event, and no MD"""
@@ -1712,7 +1712,7 @@
         os.mkdir(dir)
         path_b = os.path.join(self.share.path, "dir", "b")
         open(path_b, "w").close()
-        mdid_dir = self.fsm.create(dir, self.share.volume_id, is_dir=True)
+        self.fsm.create(dir, self.share.volume_id, is_dir=True)
         self.fsm.set_node_id(dir, "uuid2")
 
         mdid_b = self.fsm.create(path_b, self.share.volume_id, is_dir=False)
 
=== modified file 'tests/syncdaemon/test_sync.py'
--- tests/syncdaemon/test_sync.py	2010-01-22 20:31:51 +0000
+++ tests/syncdaemon/test_sync.py	2010-02-10 17:40:25 +0000
@@ -104,7 +104,7 @@
     def test_set(self):
         """test that changes to the key are keeped in _changes until sync"""
         path = os.path.join(self.share.path, 'path')
-        mdid = self.fsm.create(path, "share", node_id='uuid1')
+        self.fsm.create(path, "share", node_id='uuid1')
         key = FSKey(self.fsm, path=path)
         key.set(local_hash='a_hash')
         self.assertEquals('a_hash', key._changes['local_hash'])
 
=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2010-02-01 13:43:33 +0000
+++ tests/syncdaemon/test_vm.py	2010-02-10 17:40:25 +0000
@@ -474,7 +474,7 @@
         """Test for VolumeManager._delete_fsm_object"""
         path = os.path.join(self.root_dir, 'dir')
         os.makedirs(path)
-        mdid = self.main.fs.create(path, "", is_dir=True)
+        self.main.fs.create(path, "", is_dir=True)
         self.main.fs.set_node_id(path, 'dir_node_id')
         self.main.event_q.inotify_add_watch(path)
         self.assertTrue(self.main.event_q.inotify_has_watch(path), path)
@@ -858,7 +858,6 @@
 
     def test_handle_AQ_LIST_VOLUMES_root(self):
         """Test the handling of the AQ_LIST_VOLUMES event."""
-        share_id = uuid.uuid4()
         root_volume = volumes.RootVolume(uuid.uuid4())
         response = [root_volume]
         self.vm.refresh_volumes = lambda: self.fail('refresh_volumes called!')
@@ -1209,8 +1208,6 @@
         """Test for handle_AQ_CREATE_UDF_ERROR."""
         d = defer.Deferred()
         path = os.path.join(self.home_dir, u'ñoño'.encode("utf8"))
-        udf_id = uuid.uuid4()
-        node_id = uuid.uuid4()
         # patch AQ.create_udf
         def create_udf(path, name, marker):
             """Fake create_udf"""
@@ -1393,7 +1390,6 @@
                                node_id=str(uuid.uuid4()),
                                volume_id='accepted_share_id',
                                access_level='Modify', accepted=False)
-        share_path_view = os.path.join(self.shares_dir, 'fake_share_view')
         share_view = Share(path=share_path, volume_id='share_id_view',
                            access_level='View', accepted=True)
         self.vm.add_share(share_modify)
 
=== modified file 'ubuntuone/oauthdesktop/auth.py'
--- ubuntuone/oauthdesktop/auth.py	2009-12-23 19:44:00 +0000
+++ ubuntuone/oauthdesktop/auth.py	2010-02-10 17:40:25 +0000
@@ -90,7 +90,7 @@
             newurl = headers['uri']
         else:
             return
-        void = fp.read()
+        fp.read()
         fp.close()
         # In case the server sent a relative URL, join with original:
         newurl = urllib.basejoin(self.type + ":" + url, newurl)
 
=== modified file 'ubuntuone/syncdaemon/dbus_interface.py'
--- ubuntuone/syncdaemon/dbus_interface.py	2010-02-01 17:48:25 +0000
+++ ubuntuone/syncdaemon/dbus_interface.py	2010-02-10 17:40:25 +0000
@@ -1434,7 +1434,7 @@
         try:
             access_token = self.main.get_access_token()
             self.event_queue.push('SYS_CONNECT', access_token)
-        except NoAccessToken, e:
+        except NoAccessToken:
             if do_login:
                 yield self._request_token()
                 self.connect(do_login=False)
 
=== modified file 'ubuntuone/syncdaemon/events_nanny.py'
--- ubuntuone/syncdaemon/events_nanny.py	2009-11-20 22:00:25 +0000
+++ ubuntuone/syncdaemon/events_nanny.py	2010-02-10 17:40:25 +0000
@@ -96,7 +96,7 @@
         self._hashing.add(path)
 
         try:
-            opened = self._reduce_opened(path)
+            self._reduce_opened(path)
         except KeyError:
             # it wasn't supervised by open
             return
 
=== modified file 'ubuntuone/syncdaemon/filesystem_manager.py'
--- ubuntuone/syncdaemon/filesystem_manager.py	2010-01-14 14:18:32 +0000
+++ ubuntuone/syncdaemon/filesystem_manager.py	2010-02-10 17:40:25 +0000
@@ -277,7 +277,7 @@
                 # check if the share exists
                 try:
                     self._get_share(mdobj["share_id"])
-                except KeyError, e:
+                except KeyError:
                     # oops, the share is gone!, invalidate this mdid
                     log_warning('Share %s disappeared! deleting mdid: %s', mdobj['share_id'], mdid)
                     del self.fs[mdid]
@@ -784,7 +784,6 @@
 
     def _get_partial_path(self, mdobj):
         """Gets the path of the .partial file for a given mdobj"""
-        is_dir = mdobj["is_dir"]
         path = self.get_abspath(mdobj['share_id'], mdobj['path'])
         partial_path = os.path.join(self.partials_dir, mdobj['mdid'] + '.u1partial')
         dirname, filename = os.path.split(path)
 
=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2010-02-09 15:22:50 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2010-02-10 17:40:25 +0000
@@ -905,7 +905,7 @@
                 return result
             try:
                 d = self._scan_udf(udf)
-            except KeyError, e:
+            except KeyError:
                 push_error("METADATA_DOES_NOT_EXIST")
             else:
                 d.addCallback(subscribe)
@@ -961,7 +961,7 @@
     def handle_AQ_DELETE_VOLUME_ERROR(self, volume_id, error):
         """Handle AQ_DELETE_VOLUME_ERROR."""
         try:
-            volume = self.get_volume(str(volume_id))
+            self.get_volume(str(volume_id))
         except KeyError:
             self.log.warning("Received a AQ_DELETE_VOLUME_ERROR of a missing"
                              "volume id")
@@ -1310,9 +1310,10 @@
             if 'id' in share.__dict__:
                 share.volume_id = share.__dict__.pop('id')
             if 'free_bytes' in share.__dict__:
-                free_bytes = share.__dict__.pop('free_bytes')
+                # FIXME: REVIEWERS PLEASE CONFIRM THIS IS CORRECT
+                share.free_bytes = share.__dict__.pop('free_bytes')
             else:
-                free_bytes = None
+                share.free_bytes = None
             return share
         # handle the root special case
         if share.path == self._root_dir or share.id == '':
 
=== modified file 'ubuntuone/u1sync/client.py'
--- ubuntuone/u1sync/client.py	2010-01-20 23:18:55 +0000
+++ ubuntuone/u1sync/client.py	2010-02-10 17:40:25 +0000
@@ -365,7 +365,7 @@
                                    lambda f: waiter.wake((None, None, f)))
                 else:
                     waiter.wake((d, None, None))
-            except Exception, e:
+            except Exception:
                 waiter.wake((None, sys.exc_info(), None))
 
         self.reactor.callFromThread(runner)
 
=== modified file 'ubuntuone/u1sync/main.py'
--- ubuntuone/u1sync/main.py	2010-01-20 22:56:50 +0000
+++ ubuntuone/u1sync/main.py	2010-02-10 17:40:25 +0000
@@ -442,7 +442,7 @@
         """Capture the exception from calling func."""
         try:
             func()
-        except Exception, e:
+        except Exception:
             queue.put(sys.exc_info())
         else:
             queue.put(None)