flake8 fixes

Author: kylebebak

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+max-line-length = 120

README.md

@@ -1,5 +1,8 @@
 # pick-git
 
+
+![License](https://camo.githubusercontent.com/890acbdcb87868b382af9a4b1fac507b9659d9bf/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6c6963656e73652d4d49542d626c75652e737667)
+
 __pick-git__ is a set of command line tools for leveraging thoughtbot's [pick](https://github.com/calleerlandsson/pick) to turbocharge your Git workflow.
 
 Git can be a bit of a pain, especially when passing branches or commit hashes as args. Big projects have lots of branches and tons of commits. Finding and copying commit hashes to compare commits, for example, is awkward and slow.
@@ -25,7 +28,6 @@ Check out how __pick-git__ removes the pain of finding and comparing commits.
 
 ![pick-git -b commit git diff](https://raw.githubusercontent.com/kylebebak/pick-git/master/examples/ghp.gif)
 
-
 I invoked `ghp -b gd`, but what just happened? Let's break it down.
 
 I have `ghp` aliased to `pick-git --function commit`. The function argument is one of the public functions exposed by pick-git.
@@ -34,6 +36,7 @@ I have `ghp` aliased to `pick-git --function commit`. The function argument is o
 
 At the end the final command that was invoked, `gd 28faaf7 4750072`, was printed to the console. I was able to find two commits and compare them very quickly and with very few keystrokes. __Even if these commits had been in a much bigger project and were months old__, pick's fuzzy select would have found them in no time as long as my commit messages were descriptive.
 
+
 ### Shortcuts to pick-git Public Functions
 It's a good idea to create shortcut aliases to all of the functions exposed by __pick-git__. You can simply copy and paste the following into your startup script, e.g. `.bash_profile`.
 
@@ -64,6 +67,7 @@ Here are descriptions of __pick-git__'s public functions. Run `pick-git -h` to g
 - __branch_compare__: Find out how far ahead or behind `this` branch is compared with `that`. A `detailed` comparison shows all commits instead of just the commit count.
 - __file_commit__: Pick a file from index, and show all commits for this file. Pick a commit and diff file against HEAD or `show` it.
 
+
 ### --shell and --rcfile
 I actually lied above. I really have `ghp` aliased to `pick-git --shell /bin/bash --rcfile ~/.git_aliases --function commit`. What are these --shell and --rcfile args, and why are they useful?
 
@@ -82,6 +86,7 @@ alias ga='git add'
 alias gr='git reset'
 ~~~
 
+
 ### Help
 Run `pick-git -h`.
 

main.py

@@ -1,5 +1,6 @@
 from pick_git.command_line import main
 
+
 if __name__ == '__main__':
     """Ensure that the script can be invoked from the command line while testing
     the package, i.e. without going through the shim created by `setuptools` when

pick_git/command_line.py

@@ -1,4 +1,6 @@
-import subprocess, argparse, sys
+import subprocess
+import argparse
+import sys
 
 from .pg import PG
 from .helpers import PGPublicMethodMixin

pick_git/core.py

@@ -1,4 +1,6 @@
-import subprocess, sys, os
+import subprocess
+import sys
+import os
 from subprocess import STDOUT, PIPE
 from functools import wraps
 
@@ -8,13 +10,15 @@ def repository_root():
     """
     return subprocess.check_output(['git', 'rev-parse', '--show-toplevel']).strip().decode('utf-8')
 
+
 def cd_repository_root():
     """Change directory to repo root. `os.chdir` means directory is changed for
     instance of shell from which script is executed, rather than only in child
     process.
     """
     os.chdir(repository_root())
 
+
 def current_branch():
     """Return name of currently checked out branch.
     """
@@ -32,6 +36,7 @@ def add_new_line(b):
             b += bytes('\n', 'utf-8')
     return b
 
+
 def exit_on_keyboard_interrupt(f):
     """Decorator that allows user to exit script by sending a keyboard interrupt
     (ctrl + c) without raising an exception.
@@ -47,6 +52,7 @@ def wrapper(*args, **kwargs):
             raise KeyboardInterrupt
     return wrapper
 
+
 @exit_on_keyboard_interrupt
 def pick_branch(*args):
     """Pick a branch, local or remote.
@@ -55,6 +61,7 @@ def pick_branch(*args):
     branch = subprocess.check_output(['pick'], stdin=branches.stdout)
     return branch.split()[-1].decode('utf-8')
 
+
 @exit_on_keyboard_interrupt
 def pick_tag(*args):
     """Pick a local tag.
@@ -63,6 +70,7 @@ def pick_tag(*args):
     branch = subprocess.check_output(['pick'], stdin=branches.stdout)
     return branch.split()[-1].decode('utf-8')
 
+
 @exit_on_keyboard_interrupt
 def pick_commit(*args):
     """Pick a commit hash.
@@ -73,6 +81,7 @@ def pick_commit(*args):
     commit = p.communicate(input=commits)[0]
     return commit.split()[0].decode('utf-8')
 
+
 @exit_on_keyboard_interrupt
 def pick_commit_reflog(*args):
     """Pick a commit hash from the reflog.
@@ -83,15 +92,17 @@ def pick_commit_reflog(*args):
     commit = p.communicate(input=commits)[0]
     return commit.split()[0].decode('utf-8')
 
+
 @exit_on_keyboard_interrupt
 def pick_modified_file(*args):
     """Pick a file whose state differs between branches or commits, which are
     passed in `args`. `args` can contain between 0 and 2 elements.
     """
-    files = subprocess.Popen(('git', 'diff', '--name-only',) + args, stdout=PIPE)
+    files = subprocess.Popen(('git', 'diff', '--name-only') + args, stdout=PIPE)
     file = subprocess.check_output(['pick'], stdin=files.stdout)
     return file.strip().decode('utf-8')
 
+
 @exit_on_keyboard_interrupt
 def pick_file(*args):
     """Pick a file from the index.

pick_git/helpers.py

@@ -64,12 +64,13 @@ def _pick_file(self, *args, **kwargs):
         function = kwargs.get('function')
         show = kwargs.pop('show', False)
         cd_repository_root()
-        entities = [function(), function() if kwargs.pop('both', False) else 'HEAD']; self.copy(' '.join(entities))
+        entities = [function(), function() if kwargs.pop('both', False) else 'HEAD']
+        self.copy(' '.join(entities))
         file = pick_modified_file(*entities)
-        if show: # ugly syntax, but (a, b*, c) syntax isn't valid in python 2
-            self.execute(*('git', 'show',) + args + ('{}:{}'.format(entities[0], file),))
+        if show:  # ugly syntax, but (a, b*, c) syntax isn't valid in python 2
+            self.execute(*('git', 'show') + args + ('{}:{}'.format(entities[0], file),))
         else:
-            self.execute(*('git', 'diff',) + args + ('{} -- {} {}'.format(entities[0], entities[1], file),))
+            self.execute(*('git', 'diff') + args + ('{} -- {} {}'.format(entities[0], entities[1], file),))
 
     def branch_file(self, *args, **kwargs):
         """Pick branch(es), get list of files that are different in these
@@ -112,13 +113,14 @@ def file_commit(self, *args, **kwargs):
         """
         show = kwargs.pop('show', False)
         cd_repository_root()
-        file = pick_file(); self.copy(file)
+        file = pick_file()
+        self.copy(file)
         commit = pick_commit('--follow', '--', file)
         try:
             other_file = pick_modified_file(commit, raise_exception=True)
         except KeyboardInterrupt:
             other_file = file
         if show:
-            self.execute(*('git', 'show',) + args + ('{}:{}'.format(commit, file),))
+            self.execute(*('git', 'show') + args + ('{}:{}'.format(commit, file),))
         else:
-            self.execute(*('git', 'diff',) + args + ('{} -- {} {}'.format(commit, file, other_file),))
+            self.execute(*('git', 'diff') + args + ('{} -- {} {}'.format(commit, file, other_file),))

pick_git/pg.py

@@ -11,9 +11,9 @@ def __init__(self, no_copy=False, shell='', rcfile='', **kwargs):
         self.rcfile = rcfile
 
         self._copy = lambda text: None
-        if no_copy: # don't attempt to use pyperclip
+        if no_copy:  # don't attempt to use pyperclip
             return
-        try: # import pyperclip if it's installed, use `pyperclip.copy` if it works
+        try:  # import pyperclip if it's installed, use `pyperclip.copy` if it works
             import pyperclip
         except ImportError:
             print('install pyperclip for a better experience')
@@ -36,7 +36,8 @@ def execute(self, *commands):
         `shell` var, the shell specified by the $SHELL env var, or by the default
         shell.
         """
-        commands = ' '.join(commands); print(commands)
+        commands = ' '.join(commands)
+        print(commands)
         rcfile = ['--rcfile', self.rcfile] if self.rcfile else []
         if self.shell:
             p = Popen([self.shell] + rcfile + ['-i', '-c', commands])

setup.py

@@ -1,13 +1,14 @@
 from setuptools import setup
 
+
 setup(
     name='pick-git',
     version='1.2.1',
     description="Use pick by thoughtbot to turbocharge your Git workflow",
     long_description='Check it out on GitHub',
     keywords='pick git thoughtbot fuzzy select terminal productivity',
     url='https://github.com/kylebebak/pick-git',
-    download_url = 'https://github.com/kylebebak/pick-git/tarball/1.2.1',
+    download_url='https://github.com/kylebebak/pick-git/tarball/1.2.1',
     author='kylebebak',
     author_email='[email protected]',
     license='MIT',
@@ -22,5 +23,5 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python',
-    ]
+    ],
 )

tests/test_core.py

@@ -1,10 +1,12 @@
 import unittest
 from pick_git import pg
 
+
 class TestCore(unittest.TestCase):
 
     def test_name(self):
-        self.assertEqual(1,1)
+        self.assertEqual(1, 1)
+
 
 if __name__ == '__main__':
     unittest.main()