wa: pep8 fixes

wa/utils/android.py

@@ -57,7 +57,7 @@ class LogcatParser(object):
                 if event:
                     yield event
 
-    def parse_line(self, line): #pylint: disable=no-self-use
+    def parse_line(self, line):  # pylint: disable=no-self-use
         line = line.strip()
         if not line or line.startswith('-') or ': ' not in line:
             return None

wa/utils/diff.py

@@ -18,7 +18,7 @@ import re
 import logging
 
 
-from builtins import zip #pyline disable=redefined-builtin
+from builtins import zip  # pylint: disable=redefined-builtin
 from future.moves.itertools import zip_longest
 
 from wa.utils.misc import diff_tokens, write_table
@@ -26,6 +26,7 @@ from wa.utils.misc import ensure_file_directory_exists as _f
 
 logger = logging.getLogger('diff')
 
+
 def diff_interrupt_files(before, after, result):  # pylint: disable=R0914
     output_lines = []
     with open(before) as bfh:

wa/utils/exec_control.py

@@ -24,7 +24,7 @@ def activate_environment(name):
     environment with that name does not already exist, it will be
     created.
     """
-    #pylint: disable=W0603
+    # pylint: disable=W0603
     global __active_environment
 
     if name not in list(__environments.keys()):

wa/utils/log.py

@@ -49,7 +49,8 @@ _indent_width = 4
 _console_handler = None
 _init_handler = None
 
-#pylint: disable=global-statement
+
+# pylint: disable=global-statement
 def init(verbosity=logging.INFO, color=True, indent_with=4,
          regular_fmt='%(levelname)-8s %(message)s',
          verbose_fmt='%(asctime)s %(levelname)-8s %(name)10.10s: %(message)s',
@@ -95,7 +96,7 @@ def set_level(level):
     _console_handler.setLevel(level)
 
 
-#pylint: disable=global-statement
+# pylint: disable=global-statement
 def add_file(filepath, level=logging.DEBUG,
              fmt='%(asctime)s %(levelname)-8s %(name)10.10s: %(message)s'):
     global _init_handler
@@ -140,13 +141,13 @@ def __disable_logger(logger):
     logger.propagate = False
 
 
-#pylint: disable=global-statement
+# pylint: disable=global-statement
 def indent():
     global _indent_level
     _indent_level += 1
 
 
-#pylint: disable=global-statement
+# pylint: disable=global-statement
 def dedent():
     global _indent_level
     _indent_level -= 1
@@ -161,7 +162,7 @@ def indentcontext():
         dedent()
 
 
-#pylint: disable=global-statement
+# pylint: disable=global-statement
 def set_indent_level(level):
     global _indent_level
     old_level = _indent_level

wa/utils/misc.py

@@ -418,7 +418,8 @@ def categorize(v):
     else:
         return 'c'
 
-#pylint: disable=too-many-return-statements,too-many-branches
+
+# pylint: disable=too-many-return-statements,too-many-branches
 def merge_config_values(base, other):
     """
     This is used to merge two objects, typically when setting the value of a

wa/utils/serializer.py

@@ -65,7 +65,7 @@ from datetime import datetime
 import yaml as _yaml
 import dateutil.parser
 
-#pylint: disable=redefined-builtin
+# pylint: disable=redefined-builtin
 from past.builtins import basestring
 
 from wa.framework.exception import SerializerSyntaxError
@@ -275,7 +275,7 @@ class python(object):
             exec(s, pod)  # pylint: disable=exec-used
         except SyntaxError as e:
             raise SerializerSyntaxError(e.message, e.lineno)
-        for k in list(pod.keys()): # pylint: disable=consider-iterating-dictionary
+        for k in list(pod.keys()):  # pylint: disable=consider-iterating-dictionary
             if k.startswith('__'):
                 del pod[k]
         return pod
@@ -351,7 +351,7 @@ def _write_pod(pod, wfh, fmt=None):
 
 
 def is_pod(obj):
-    if type(obj) not in POD_TYPES: #pylint: disable=unidiomatic-typecheck
+    if type(obj) not in POD_TYPES:  # pylint: disable=unidiomatic-typecheck
         return False
     if hasattr(obj, 'items'):
         for k, v in obj.items():

wa/utils/trace_cmd.py

@@ -266,7 +266,7 @@ class TraceCmdParser(object):
                          by trace-cmd
         """
         inside_maked_region = False
-        #pylint: disable=superfluous-parens
+        # pylint: disable=superfluous-parens
         filters = [re.compile('^{}$'.format(e)) for e in (self.events or [])]
         filter_markers = self.filter_markers
         if filter_markers and self.check_for_markers:

wa/utils/types.py

@@ -32,12 +32,12 @@ import shlex
 import sys
 from bisect import insort
 if sys.version_info[0] == 3:
-    from urllib.parse import quote, unquote #pylint: disable=no-name-in-module, import-error
-    from past.builtins import basestring #pylint: disable=redefined-builtin
+    from urllib.parse import quote, unquote  # pylint: disable=no-name-in-module, import-error
+    from past.builtins import basestring  # pylint: disable=redefined-builtin
     long = int
 else:
     from urllib import quote, unquote
-#pylint: disable=wrong-import-position
+# pylint: disable=wrong-import-position
 from collections import defaultdict, MutableMapping
 from copy import copy
 from functools import total_ordering
@@ -800,7 +800,7 @@ class cpu_mask(object):
         elif isinstance(cpus, list):
             self._mask = list_to_mask(cpus)
         elif isinstance(cpus, cpu_mask):
-            self._mask = cpus._mask # pylint: disable=protected-access
+            self._mask = cpus._mask  # pylint: disable=protected-access
         else:
             msg = 'Unknown conversion from {} to cpu mask'
             raise ValueError(msg.format(cpus))