From 98441425286c39a63d32ec9217763e843afac354 Mon Sep 17 00:00:00 2001
From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Tue, 26 Feb 2013 11:39:17 -0500
Subject: [PATCH] Update the VCS docs

Also, update the git_hook auto-installer text.
Fixes #87 on BitBucket
---
 docs/vcs.rst    | 9 ++++++---
 flake8/hooks.py | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/vcs.rst b/docs/vcs.rst
index 444d607..7626454 100644
--- a/docs/vcs.rst
+++ b/docs/vcs.rst
@@ -8,8 +8,8 @@ To use the Mercurial hook on any *commit* or *qrefresh*, change your .hg/hgrc
 file like this::
 
     [hooks]
-    commit = python:flake8.run.hg_hook
-    qrefresh = python:flake8.run.hg_hook
+    commit = python:flake8.hooks.hg_hook
+    qrefresh = python:flake8.hooks.hg_hook
 
     [flake8]
     strict = 0
@@ -32,13 +32,16 @@ To use the Git hook on any *commit*, add a **pre-commit** file in the
 
     #!/usr/bin/env python
     import sys
-    from flake8.run import git_hook
+    from flake8.hooks import git_hook
 
     COMPLEXITY = 10
     STRICT = False
 
     if __name__ == '__main__':
         sys.exit(git_hook(complexity=COMPLEXITY, strict=STRICT, ignore='E501'))
+        # Alternatively
+        # sys.exit(git_hook(complexity=COMPLEXITY, strict=STRICT,
+        #                   ignore=['E501']))
 
 
 If *strict* option is set to **True**, any warning will block the commit. When
diff --git a/flake8/hooks.py b/flake8/hooks.py
index 4065d89..0c3c6ee 100644
--- a/flake8/hooks.py
+++ b/flake8/hooks.py
@@ -29,6 +29,9 @@ def git_hook(complexity=-1, strict=False, ignore=None, lazy=False):
     if lazy:
         gitcmd = gitcmd.replace('--cached ', '')
 
+    if hasattr(ignore, 'split'):
+        ignore = ignore.split(',')
+
     _, files_modified, _ = run(gitcmd)
 
     flake8_style = get_style_guide(