Give priority to --select over --ignore; issue #188

Author: florentx

CHANGES.txt

@@ -11,6 +11,8 @@ Changelog
   directory, merge their contents.  The ``tox.ini`` file takes
   precedence (same as before). (Issue #182)
 
+* Give priority to ``--select`` over ``--ignore``. (Issue #188)
+
 
 1.4.5 (2013-03-06)
 ------------------

pep8.py

@@ -1579,7 +1579,7 @@ def __init__(self, *args, **kwargs):
             options.ignore = tuple(DEFAULT_IGNORE.split(','))
         else:
             # Ignore all checks which are not explicitly selected
-            options.ignore = tuple(options.ignore or options.select and ('',))
+            options.ignore = ('',) if options.select else tuple(options.ignore)
         options.benchmark_keys = BENCHMARK_KEYS[:]
         options.ignore_code = self.ignore_code
         options.physical_checks = self.get_checks('physical_line')

testsuite/test_api.py

@@ -194,6 +194,18 @@ def parse_argv(argstring):
         self.assertEqual(options.select, ('E', 'W'))
         self.assertEqual(options.ignore, ('',))
 
+        options = parse_argv('--select E --ignore E24').options
+        self.assertEqual(options.select, ('E',))
+        self.assertEqual(options.ignore, ('',))
+
+        options = parse_argv('--ignore E --select E24').options
+        self.assertEqual(options.select, ('E24',))
+        self.assertEqual(options.ignore, ('',))
+
+        options = parse_argv('--ignore W --select E24').options
+        self.assertEqual(options.select, ('E24',))
+        self.assertEqual(options.ignore, ('',))
+
         pep8style = pep8.StyleGuide(paths=[E11])
         self.assertFalse(pep8style.ignore_code('E112'))
         self.assertFalse(pep8style.ignore_code('W191'))