From 7200f8f4bd13f88da7705af5742945ac40049c12 Mon Sep 17 00:00:00 2001
From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Sun, 30 Dec 2012 18:05:30 -0500
Subject: [PATCH] Filter out our options before passing to pep8

Update the .hgignore with a few pet peeves.
---
 .hgignore     |  2 ++
 flake8/run.py | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.hgignore b/.hgignore
index 239c799..41cb134 100644
--- a/.hgignore
+++ b/.hgignore
@@ -6,3 +6,5 @@ bin
 flake8.egg-info
 man
 \.Python
+nose*
+.*\.swp
diff --git a/flake8/run.py b/flake8/run.py
index 6353dc5..fadf5d7 100644
--- a/flake8/run.py
+++ b/flake8/run.py
@@ -75,7 +75,8 @@ def get_parser():
         sys.exit(0)
 
     # Create our own parser
-    parser = optparse.OptionParser('%prog [options]', version=version)
+    parser = optparse.OptionParser('%prog [options] [file.py|directory]',
+                                   version=version)
     parser.version = '{0} (pep8: {1}, flakey: {2})'.format(
         __version__, pep8.__version__, flakey.__version__)
     parser.remove_option('--version')
@@ -98,9 +99,12 @@ def get_parser():
 def main():
     global pep8style
 
+    # parse out our flags so pep8 doesn't get confused
     parser = get_parser()
-    # parse our flags
-    opts, args = parser.parse_args()
+    opts, sys.argv = parser.parse_args()
+
+    # make sure pep8 gets the information it expects
+    sys.argv.insert(0, 'pep8')
 
     pep8style = pep8.StyleGuide(parse_argv=True, config_file=True)
     options = pep8style.options