Merge pull request #21 from kevinjqiu/issue-18-fix-lint

fixes #18

Makefile

@@ -7,7 +7,7 @@ stop_couchdb:
 	.travis/stop-couchdb.sh
 
 flake8:
-	flake8 --max-line-length=120 cdbcli tests
+	flake8 --max-line-length=120 --ignore=F405 cdbcli tests
 
-test:
+test: flake8
 	py.test --cov=cdbcli --cov=tests --cov-report term-missing tests

cdbcli/repl.py

@@ -3,7 +3,7 @@
 import couchdb
 
 import prompt_toolkit as pt
-from prompt_toolkit import history, shortcuts
+from prompt_toolkit import history
 from .lexer import lexer
 from .completer import get_completer
 from .style import style

requirements-test.txt

@@ -3,3 +3,4 @@ pytest
 pytest-cov
 coveralls
 pytest-mock
+flake8

tests/integration/test_repl.py

@@ -223,7 +223,8 @@ def test_man_unrecognized_command(environment, couch_server):
 
 def test_man_command_has_no_help(environment, couch_server):
     @command_handler('xyz')
-    def xyz(*args, **kwargs): pass  # pragma: nocover
+    def xyz(*args, **kwargs):  # pragma: nocover
+        pass
 
     eval_(environment, couch_server, 'man xyz')
     output = _get_output(environment)