From 3c81b82193e3e146a94a1b9ec4c48626090921b0 Mon Sep 17 00:00:00 2001
From: David Aguilar <davvid@gmail.com>
Date: Thu, 23 Jun 2016 00:38:26 -0700
Subject: [PATCH] core: apply flake8 suggestions

Signed-off-by: David Aguilar <davvid@gmail.com>
---
 cola/core.py | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/cola/core.py b/cola/core.py
index 34d62b92..a476374b 100644
--- a/cola/core.py
+++ b/cola/core.py
@@ -28,6 +28,7 @@ _encoding_tests = [
     # <-- add encodings here
 ]
 
+
 def decode(enc, encoding=None, errors='strict'):
     """decode(encoded_string) returns an unencoded unicode string
     """
@@ -203,7 +204,8 @@ def _fork_win32(args, cwd=None):
         argv = [decode(arg) for arg in args]
     else:
         argv = [encode(arg) for arg in args]
-    DETACHED_PROCESS = 0x00000008 # Amazing!
+
+    DETACHED_PROCESS = 0x00000008  # Amazing!
     return subprocess.Popen(argv, cwd=cwd, creationflags=DETACHED_PROCESS).pid
 
 
@@ -224,8 +226,8 @@ def _win32_find_exe(exe):
     # extensions specified in PATHEXT
     if '.' not in exe:
         extensions = getenv('PATHEXT', '').split(os.pathsep)
-        candidates.extend([exe+ext for ext in extensions
-                            if ext.startswith('.')])
+        candidates.extend([(exe + ext) for ext in extensions
+                           if ext.startswith('.')])
     # search the current directory first
     for candidate in candidates:
         if exists(candidate):
@@ -250,12 +252,18 @@ else:
     fork = _fork_posix
 
 
+def _decorator_noop(x):
+    return x
+
+
 def wrap(action, fn, decorator=None):
     """Wrap arguments with `action`, optionally decorate the result"""
     if decorator is None:
-        decorator = lambda x: x
+        decorator = _decorator_noop
+
     def wrapped(*args, **kwargs):
         return decorator(fn(action(*args, **kwargs)))
+
     return wrapped
 
 
@@ -308,7 +316,12 @@ makedirs = wrap(mkpath, os.makedirs)
 try:
     readlink = wrap(mkpath, os.readlink, decorator=decode)
 except AttributeError:
-    readlink = lambda p: p
+
+    def _readlink_noop(p):
+        return p
+
+    readlink = _readlink_noop
+
 realpath = wrap(mkpath, os.path.realpath, decorator=decode)
 relpath = wrap(mkpath, os.path.relpath, decorator=decode)
 stat = wrap(mkpath, os.stat)
-- 
2.11.4.GIT