Merge lp:~nataliabidart/magicicada-client/fix-lint-issues into lp:magicicada-client

[Natalia Bidart]

- Fixed lint issues after pep8 version bump.

[lp:~nataliabidart/magicicada-client/fix-lint-issues]

1437. By Natalia Bidart on 2018-03-08

Merged trunk into fix-lint-issues.

[Facundo Batista (facundo)]

review: Approve

=== modified file 'ubuntuone/networkstate/networkstates.py'
--- ubuntuone/networkstate/networkstates.py	2016-05-28 23:52:12 +0000
+++ ubuntuone/networkstate/networkstates.py	2018-03-08 19:49:59 +0000
@@ -27,6 +27,7 @@
     def __repr__(self):
         return "Network state (%s)" % self.label
 
+
 # Values returned by the callback
 (ONLINE, OFFLINE, UNKNOWN) = (NetworkState("online"),
                               NetworkState("offline"),

=== modified file 'ubuntuone/platform/filesystem_notifications/pyinotify_agnostic.py'
--- ubuntuone/platform/filesystem_notifications/pyinotify_agnostic.py	2015-09-19 23:15:50 +0000
+++ ubuntuone/platform/filesystem_notifications/pyinotify_agnostic.py	2018-03-08 19:49:59 +0000
@@ -65,6 +65,7 @@
         """Class name color."""
         return self.format.get('red', '') + self.simple(s, 'bold')
 
+
 output_format = RawOutputFormat()
 
 

=== modified file 'ubuntuone/platform/os_helper/windows.py'
--- ubuntuone/platform/os_helper/windows.py	2015-09-19 23:15:50 +0000
+++ ubuntuone/platform/os_helper/windows.py	2018-03-08 19:49:59 +0000
@@ -248,6 +248,7 @@
     assert_windows_path(result)
     return result
 
+
 get_os_valid_path = get_windows_valid_path
 
 
@@ -327,6 +328,7 @@
     """
     return _is_valid_path(assert_windows_path, path_indexes)
 
+
 is_valid_os_path = is_valid_windows_path
 
 
@@ -413,6 +415,7 @@
     """
     return _transform_path(get_windows_valid_path, path_indexes)
 
+
 os_path = windowspath
 
 
@@ -671,7 +674,7 @@
         shortcut.SetWorkingDirectory(target)
         pf = shortcut.QueryInterface(IPersistFile)
         pf.Save(destination, True)
-    except:
+    except Exception:
         logger.exception('make_link could not be completed for target %r, '
                          'destination %r:', target, destination)
         raise

=== modified file 'ubuntuone/platform/sync_menu/linux.py'
--- ubuntuone/platform/sync_menu/linux.py	2016-09-17 01:06:23 +0000
+++ ubuntuone/platform/sync_menu/linux.py	2018-03-08 19:49:59 +0000
@@ -43,7 +43,7 @@
         SyncMenu,
     )
     use_syncmenu = True
-except:
+except ImportError:
     use_syncmenu = False
 
 from ubuntuone.clientdefs import GETTEXT_PACKAGE, NAME

=== modified file 'ubuntuone/platform/tests/ipc/test_perspective_broker.py'
--- ubuntuone/platform/tests/ipc/test_perspective_broker.py	2016-06-03 19:52:03 +0000
+++ ubuntuone/platform/tests/ipc/test_perspective_broker.py	2018-03-08 19:49:59 +0000
@@ -85,6 +85,7 @@
 class NoTestCase(object):
     """Dummy class to be used when txsocketserver is not available."""
 
+
 try:
     from ubuntuone.devtools.testcases.txsocketserver import (
         TidyUnixServer,

=== modified file 'ubuntuone/platform/tests/os_helper/test_os_helper.py'
--- ubuntuone/platform/tests/os_helper/test_os_helper.py	2016-06-01 18:28:19 +0000
+++ ubuntuone/platform/tests/os_helper/test_os_helper.py	2018-03-08 19:49:59 +0000
@@ -276,9 +276,9 @@
             open_file(os.path.join(self.basedir, extra), 'w').close()
             expected_result.append(extra)
 
-        l = listdir(self.basedir)
-        self.assertEqual(sorted(l), sorted(expected_result))
-        for path in l:
+        dirs = listdir(self.basedir)
+        self.assertEqual(sorted(dirs), sorted(expected_result))
+        for path in dirs:
             self.assertIsInstance(path, type(self.basedir))
 
     def test_access_rw(self):

=== modified file 'ubuntuone/platform/tools/__init__.py'
--- ubuntuone/platform/tools/__init__.py	2016-09-17 01:06:23 +0000
+++ ubuntuone/platform/tools/__init__.py	2018-03-08 19:49:59 +0000
@@ -688,7 +688,7 @@
     """Format an error when things go wrong"""
     try:
         raise error.value
-    except:
+    except Exception:
         signal, (args, retval) = error.value.args
         msg_template = u"%s: %s (%s)\n"
         fmtd_args = u", ".join("%s=%s" % (k, v) for k, v in args.items())

=== modified file 'ubuntuone/syncdaemon/filesystem_notifications.py'
--- ubuntuone/syncdaemon/filesystem_notifications.py	2015-09-19 23:15:50 +0000
+++ ubuntuone/syncdaemon/filesystem_notifications.py	2018-03-08 19:49:59 +0000
@@ -151,7 +151,7 @@
         # change the pattern IN_CREATE to FS_FILE_CREATE or FS_DIR_CREATE
         try:
             evt_name = self.name_translations[event.mask]
-        except:
+        except Exception:
             self.log.error("Unhandled Event in INotify: %s", event)
             raise KeyError("Unhandled Event in INotify: %s" % event)
         # check if the path is not frozen

=== modified file 'ubuntuone/syncdaemon/fsm/fsm.py'
--- ubuntuone/syncdaemon/fsm/fsm.py	2016-07-30 21:58:48 +0000
+++ ubuntuone/syncdaemon/fsm/fsm.py	2018-03-08 19:49:59 +0000
@@ -86,9 +86,9 @@
         if str(myvalues[name]) == "*":
             myvalues[name] = varlist[name]
         elif str(myvalues[name])[0] == "!":
-            l = varlist[name].copy()
-            l.remove(myvalues[name][1:])
-            myvalues[name] = l
+            var_list = varlist[name].copy()
+            var_list.remove(myvalues[name][1:])
+            myvalues[name] = var_list
         else:
             myvalues[name] = [myvalues[name]]
     return build_combinations_from_varlist(myvalues)
@@ -510,6 +510,7 @@
         """Get the transition for this events with these parameters."""
         return self.transitions[event, hash_dict(parameters)]
 
+
 if __name__ == "__main__":
     import sys
     s = StateMachine(sys.argv[1], sys.argv[2:])

=== modified file 'ubuntuone/syncdaemon/local_rescan.py'
--- ubuntuone/syncdaemon/local_rescan.py	2015-09-19 23:15:50 +0000
+++ ubuntuone/syncdaemon/local_rescan.py	2018-03-08 19:49:59 +0000
@@ -62,6 +62,7 @@
 class ScanNoDirectory(Exception):
     """The whole directory went away."""
 
+
 # local rescan logger
 lr_logger = logging.getLogger('ubuntuone.SyncDaemon.local_rescan')
 log_info = functools.partial(lr_logger.log, logging.INFO)

=== modified file 'ubuntuone/syncdaemon/logger.py'
--- ubuntuone/syncdaemon/logger.py	2016-05-28 23:32:02 +0000
+++ ubuntuone/syncdaemon/logger.py	2018-03-08 19:49:59 +0000
@@ -136,6 +136,7 @@
             return failure
         return callback, errback
 
+
 LOGFILENAME = os.path.join(ubuntuone_log_dir, 'syncdaemon.log')
 EXLOGFILENAME = os.path.join(ubuntuone_log_dir, 'syncdaemon-exceptions.log')
 INVALIDLOGFILENAME = os.path.join(

=== modified file 'ubuntuone/syncdaemon/tests/fsm/test_fsm_run.py'
--- ubuntuone/syncdaemon/tests/fsm/test_fsm_run.py	2016-06-03 19:52:03 +0000
+++ ubuntuone/syncdaemon/tests/fsm/test_fsm_run.py	2018-03-08 19:49:59 +0000
@@ -69,7 +69,7 @@
             H = make("h", "EEE")
             E = make("e", "LLL")
             L = make("l", "LOD")
-            O = make("o", "WRR")
+            O = make("o", "WRR")  # noqa
             W = make("w", "OOO")
             R = make("r", "LLL")
             D = make("d", ["NL"]*3)

=== modified file 'ubuntuone/syncdaemon/tests/test_action_queue.py'
--- ubuntuone/syncdaemon/tests/test_action_queue.py	2017-02-10 01:15:07 +0000
+++ ubuntuone/syncdaemon/tests/test_action_queue.py	2018-03-08 19:49:59 +0000
@@ -4960,15 +4960,15 @@
 
     def test_is_list(self):
         """A DeltaList is a list."""
-        l = [1, 2, 3]
-        a = DeltaList(l)
+        data = [1, 2, 3]
+        a = DeltaList(data)
         self.assertTrue(isinstance(a, list))
 
     def test_is_equal_list(self):
         """A DeltaList is equal to the list it represents."""
-        l = [1, 2, 3]
-        a = DeltaList(l)
-        self.assertEqual(a, l)
+        data = [1, 2, 3]
+        a = DeltaList(data)
+        self.assertEqual(a, data)
 
     def test_repr(self):
         """A DeltaList has a short representation."""

=== modified file 'ubuntuone/syncdaemon/tests/test_eventqueue.py'
--- ubuntuone/syncdaemon/tests/test_eventqueue.py	2016-06-04 21:14:35 +0000
+++ ubuntuone/syncdaemon/tests/test_eventqueue.py	2018-03-08 19:49:59 +0000
@@ -356,12 +356,12 @@
             def handle_default(self, event, **kwargs):
                 d.callback((event, kwargs))
 
-        l = Listener()
-        self.eq.subscribe(l)
+        listener = Listener()
+        self.eq.subscribe(listener)
 
         def cleanup():
             """Unsubscribe the listeners."""
-            self.eq.unsubscribe(l)
+            self.eq.unsubscribe(listener)
         self.addCleanup(cleanup)
 
         # push some event and expect it'll be handled by handle_default
@@ -401,9 +401,9 @@
         # create 10 listeners in order to create an event madness
         listeners = []
         for i in xrange(0, 10):
-            l = Listener(self.eq)
-            listeners.append(l)
-            self.eq.subscribe(l)
+            listener = Listener(self.eq)
+            listeners.append(listener)
+            self.eq.subscribe(listener)
 
         # push some events to unleash the event madness
         self.eq.push("FS_FILE_CREATE", path=1)

=== modified file 'ubuntuone/syncdaemon/tests/test_localrescan.py'
--- ubuntuone/syncdaemon/tests/test_localrescan.py	2016-07-30 22:03:39 +0000
+++ ubuntuone/syncdaemon/tests/test_localrescan.py	2018-03-08 19:49:59 +0000
@@ -1262,23 +1262,23 @@
     @defer.inlineCallbacks
     def test_one_dir_create(self):
         """Check that an example dir create is really pushed."""
-        l = Listener()
-        self.eq.subscribe(l)
-        self.addCleanup(self.eq.unsubscribe, l)
+        listener = Listener()
+        self.eq.subscribe(listener)
+        self.addCleanup(self.eq.unsubscribe, listener)
 
         # push some event
         filepath = os.path.join(self.share.path, "a")
         make_dir(filepath)
 
         yield self.lr.start()
-        self.assertItemsEqual(l.events, [('FS_DIR_CREATE', filepath)])
+        self.assertItemsEqual(listener.events, [('FS_DIR_CREATE', filepath)])
 
     @defer.inlineCallbacks
     def test_one_file_create(self):
         """Check that an example file create is really pushed."""
-        l = Listener()
-        self.eq.subscribe(l)
-        self.addCleanup(self.eq.unsubscribe, l)
+        listener = Listener()
+        self.eq.subscribe(listener)
+        self.addCleanup(self.eq.unsubscribe, listener)
 
         # push some event
         filepath = os.path.join(self.share.path, "a")
@@ -1289,14 +1289,14 @@
             ('FS_FILE_CREATE', filepath),
             ('FS_FILE_CLOSE_WRITE', filepath),
         ]
-        self.assertItemsEqual(l.events, expected)
+        self.assertItemsEqual(listener.events, expected)
 
     @defer.inlineCallbacks
     def test_one_dir_delete(self):
         """Check that an example dir delete is really pushed."""
-        l = Listener()
-        self.eq.subscribe(l)
-        self.addCleanup(self.eq.unsubscribe, l)
+        listener = Listener()
+        self.eq.subscribe(listener)
+        self.addCleanup(self.eq.unsubscribe, listener)
 
         # push some event
         filepath = os.path.join(self.share.path, "a")
@@ -1304,14 +1304,14 @@
         self.fsm.set_node_id(filepath, "uuid1")
 
         yield self.lr.start()
-        self.assertItemsEqual(l.events, [('FS_DIR_DELETE', filepath)])
+        self.assertItemsEqual(listener.events, [('FS_DIR_DELETE', filepath)])
 
     @defer.inlineCallbacks
     def test_one_file_delete(self):
         """Check that an example file delete is really pushed."""
-        l = Listener()
-        self.eq.subscribe(l)
-        self.addCleanup(self.eq.unsubscribe, l)
+        listener = Listener()
+        self.eq.subscribe(listener)
+        self.addCleanup(self.eq.unsubscribe, listener)
 
         # push some event
         filepath = os.path.join(self.share.path, "a")
@@ -1320,14 +1320,14 @@
         self.fsm.set_by_path(filepath, local_hash="hash", server_hash="hash")
 
         yield self.lr.start()
-        self.assertItemsEqual(l.events, [('FS_FILE_DELETE', filepath)])
+        self.assertItemsEqual(listener.events, [('FS_FILE_DELETE', filepath)])
 
     @defer.inlineCallbacks
     def test_file_changed(self):
         """Check that an example close write is pushed."""
-        l = Listener()
-        self.eq.subscribe(l)
-        self.addCleanup(self.eq.unsubscribe, l)
+        listener = Listener()
+        self.eq.subscribe(listener)
+        self.addCleanup(self.eq.unsubscribe, listener)
 
         # push some event
         filepath = os.path.join(self.share.path, "a")
@@ -1341,14 +1341,14 @@
             ('FS_FILE_CREATE', filepath),
             ('FS_FILE_CLOSE_WRITE', filepath),
         ]
-        self.assertItemsEqual(l.events, expected)
+        self.assertItemsEqual(listener.events, expected)
 
     @defer.inlineCallbacks
     def test_file_changed_in_nestedstruct(self):
         """Check that an example close write is pushed."""
-        l = Listener()
-        self.eq.subscribe(l)
-        self.addCleanup(self.eq.unsubscribe, l)
+        listener = Listener()
+        self.eq.subscribe(listener)
+        self.addCleanup(self.eq.unsubscribe, listener)
 
         # create nested struct
         path = os.path.join(self.share.path, "a")
@@ -1373,7 +1373,7 @@
             ('FS_FILE_CREATE', path),
             ('FS_FILE_CLOSE_WRITE', path),
         ]
-        self.assertItemsEqual(l.events, expected)
+        self.assertItemsEqual(listener.events, expected)
 
     @defer.inlineCallbacks
     def test_conflict_file(self):

=== modified file 'ubuntuone/utils/tests/test_tcpactivation.py'
--- ubuntuone/utils/tests/test_tcpactivation.py	2016-06-04 21:14:35 +0000
+++ ubuntuone/utils/tests/test_tcpactivation.py	2018-03-08 19:49:59 +0000
@@ -472,5 +472,6 @@
     else:
         client_test(config)
 
+
 if __name__ == "__main__":
     irl_test()