diff options
author | Ian Lee <IanLee1521@gmail.com> | 2014-12-13 22:42:04 -0800 |
---|---|---|
committer | Ian Lee <IanLee1521@gmail.com> | 2014-12-13 22:42:04 -0800 |
commit | c579cb144df146aed7ed24363f5c21cf0fcc713c (patch) | |
tree | 6a9779e2f4aa993277ed5e2b3718ca816b82f14b | |
parent | 17ba1e11f654e375e67299122c620a812d7895d3 (diff) | |
parent | 46aeda57095527ac1c567c17e0ef8a63a0d63d3f (diff) | |
download | pep8-c579cb144df146aed7ed24363f5c21cf0fcc713c.tar.gz |
Merge pull request #340 from bdkearns/master
Merged, thanks!
-rwxr-xr-x | pep8.py | 2 | ||||
-rw-r--r-- | testsuite/test_api.py | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -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') diff --git a/testsuite/test_api.py b/testsuite/test_api.py index f38b101..de7bc7b 100644 --- a/testsuite/test_api.py +++ b/testsuite/test_api.py @@ -160,7 +160,8 @@ class APITestCase(unittest.TestCase): ['directories', 'files', 'logical lines', 'physical lines']) self.assertEqual(pep8style.options.exclude, - ['.svn', 'CVS', '.bzr', '.hg', '.git', '__pycache__']) + ['.svn', 'CVS', '.bzr', '.hg', + '.git', '__pycache__', '.tox']) self.assertEqual(pep8style.options.filename, ['*.py']) self.assertEqual(pep8style.options.format, 'default') self.assertEqual(pep8style.options.select, ()) @@ -233,6 +234,7 @@ class APITestCase(unittest.TestCase): self.assertFalse(pep8style.excluded('./foo/bar/main.py')) self.assertTrue(pep8style.excluded('./CVS')) + self.assertTrue(pep8style.excluded('./.tox')) self.assertTrue(pep8style.excluded('./subdir/CVS')) self.assertTrue(pep8style.excluded('__pycache__')) self.assertTrue(pep8style.excluded('./__pycache__')) |