summaryrefslogtreecommitdiff
path: root/pep8.py
diff options
context:
space:
mode:
authorIan Lee <IanLee1521@gmail.com>2014-12-13 22:42:04 -0800
committerIan Lee <IanLee1521@gmail.com>2014-12-13 22:42:04 -0800
commitc579cb144df146aed7ed24363f5c21cf0fcc713c (patch)
tree6a9779e2f4aa993277ed5e2b3718ca816b82f14b /pep8.py
parent17ba1e11f654e375e67299122c620a812d7895d3 (diff)
parent46aeda57095527ac1c567c17e0ef8a63a0d63d3f (diff)
downloadpep8-c579cb144df146aed7ed24363f5c21cf0fcc713c.tar.gz
Merge pull request #340 from bdkearns/master
Merged, thanks!
Diffstat (limited to 'pep8.py')
-rwxr-xr-xpep8.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pep8.py b/pep8.py
index 11a39e8..5323592 100755
--- a/pep8.py
+++ b/pep8.py
@@ -64,7 +64,7 @@ try:
except ImportError:
from ConfigParser import RawConfigParser
-DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git,__pycache__'
+DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git,__pycache__,.tox'
DEFAULT_IGNORE = 'E123,E226,E24,E704'
if sys.platform == 'win32':
DEFAULT_CONFIG = os.path.expanduser(r'~\.pep8')