Skip to content

Commit 46aeda5

Browse files
committed
add .tox to DEFAULT_EXCLUDE
1 parent 4c5bf00 commit 46aeda5

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

pep8.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
except ImportError:
6464
from ConfigParser import RawConfigParser
6565

66-
DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git,__pycache__'
66+
DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git,__pycache__,.tox'
6767
DEFAULT_IGNORE = 'E123,E226,E24,E704'
6868
if sys.platform == 'win32':
6969
DEFAULT_CONFIG = os.path.expanduser(r'~\.pep8')

testsuite/test_api.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@ def test_styleguide_options(self):
160160
['directories', 'files',
161161
'logical lines', 'physical lines'])
162162
self.assertEqual(pep8style.options.exclude,
163-
['.svn', 'CVS', '.bzr', '.hg', '.git', '__pycache__'])
163+
['.svn', 'CVS', '.bzr', '.hg',
164+
'.git', '__pycache__', '.tox'])
164165
self.assertEqual(pep8style.options.filename, ['*.py'])
165166
self.assertEqual(pep8style.options.format, 'default')
166167
self.assertEqual(pep8style.options.select, ())
@@ -233,6 +234,7 @@ def test_styleguide_excluded(self):
233234
self.assertFalse(pep8style.excluded('./foo/bar/main.py'))
234235

235236
self.assertTrue(pep8style.excluded('./CVS'))
237+
self.assertTrue(pep8style.excluded('./.tox'))
236238
self.assertTrue(pep8style.excluded('./subdir/CVS'))
237239
self.assertTrue(pep8style.excluded('__pycache__'))
238240
self.assertTrue(pep8style.excluded('./__pycache__'))

0 commit comments

Comments
 (0)