summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lee <IanLee1521@gmail.com>2014-12-17 23:42:03 -0800
committerIan Lee <IanLee1521@gmail.com>2014-12-17 23:54:12 -0800
commit974748fd9a0ecdd494cdc51aeb16c54d38256d58 (patch)
tree7a8073ed7713899e62371f2670f86e5b0febb3b7
parent42b686b9a3504ee316e6598b4ea8e7d7a52a4cf6 (diff)
downloadpep8-974748fd9a0ecdd494cdc51aeb16c54d38256d58.tar.gz
Update DEFAULT_IGNORE to add E121 & E126 per discussion in issues #256 #316
-rwxr-xr-xpep8.py2
-rw-r--r--testsuite/test_api.py5
2 files changed, 5 insertions, 2 deletions
diff --git a/pep8.py b/pep8.py
index c8889b5..6c51733 100755
--- a/pep8.py
+++ b/pep8.py
@@ -65,7 +65,7 @@ except ImportError:
from ConfigParser import RawConfigParser
DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git,__pycache__,.tox'
-DEFAULT_IGNORE = 'E123,E226,E24,E704'
+DEFAULT_IGNORE = 'E121,E123,E126,E226,E24,E704'
try:
if sys.platform == 'win32':
DEFAULT_CONFIG = os.path.expanduser(r'~\.pep8')
diff --git a/testsuite/test_api.py b/testsuite/test_api.py
index de7bc7b..341fb34 100644
--- a/testsuite/test_api.py
+++ b/testsuite/test_api.py
@@ -179,7 +179,10 @@ class APITestCase(unittest.TestCase):
options = parse_argv('').options
self.assertEqual(options.select, ())
- self.assertEqual(options.ignore, ('E123', 'E226', 'E24', 'E704'))
+ self.assertEqual(
+ options.ignore,
+ ('E121', 'E123', 'E126', 'E226', 'E24', 'E704')
+ )
options = parse_argv('--doctest').options
self.assertEqual(options.select, ())