@@ -19,7 +19,7 @@ def setUp(self):
1919 self ._saved_stdin_get_value = pycodestyle .stdin_get_value
2020 self ._config_filenames = []
2121 self .stdin = ''
22- sys .argv = ['pep8 ' ]
22+ sys .argv = ['pycodestyle ' ]
2323 sys .stdout = PseudoFile ()
2424 sys .stderr = PseudoFile ()
2525
@@ -39,7 +39,7 @@ def tearDown(self):
3939 def stdin_get_value (self ):
4040 return self .stdin
4141
42- def pep8 (self , * args ):
42+ def pycodestyle (self , * args ):
4343 del sys .stdout [:], sys .stderr [:]
4444 sys .argv [1 :] = args
4545 try :
@@ -50,28 +50,30 @@ def pep8(self, *args):
5050 return sys .stdout .getvalue (), sys .stderr .getvalue (), errorcode
5151
5252 def test_print_usage (self ):
53- stdout , stderr , errcode = self .pep8 ('--help' )
53+ stdout , stderr , errcode = self .pycodestyle ('--help' )
5454 self .assertFalse (errcode )
5555 self .assertFalse (stderr )
56- self .assertTrue (stdout .startswith ("Usage: pep8 [options] input" ))
56+ self .assertTrue (stdout .startswith (
57+ "Usage: pycodestyle [options] input"
58+ ))
5759
58- stdout , stderr , errcode = self .pep8 ('--version' )
60+ stdout , stderr , errcode = self .pycodestyle ('--version' )
5961 self .assertFalse (errcode )
6062 self .assertFalse (stderr )
6163 self .assertEqual (stdout .count ('\n ' ), 1 )
6264
63- stdout , stderr , errcode = self .pep8 ('--obfuscated' )
65+ stdout , stderr , errcode = self .pycodestyle ('--obfuscated' )
6466 self .assertEqual (errcode , 2 )
6567 self .assertEqual (stderr .splitlines (),
66- ["Usage: pep8 [options] input ..." , "" ,
67- "pep8 : error: no such option: --obfuscated" ])
68+ ["Usage: pycodestyle [options] input ..." , "" ,
69+ "pycodestyle : error: no such option: --obfuscated" ])
6870 self .assertFalse (stdout )
6971
7072 self .assertFalse (self ._config_filenames )
7173
7274 def test_check_simple (self ):
7375 E11 = os .path .join (ROOT_DIR , 'testsuite' , 'E11.py' )
74- stdout , stderr , errcode = self .pep8 (E11 )
76+ stdout , stderr , errcode = self .pycodestyle (E11 )
7577 stdout = stdout .splitlines ()
7678 self .assertEqual (errcode , 1 )
7779 self .assertFalse (stderr )
@@ -82,20 +84,20 @@ def test_check_simple(self):
8284 self .assertEqual (x , str (num ))
8385 self .assertEqual (y , str (col ))
8486 self .assertTrue (msg .startswith (' E11' ))
85- # Config file read from the pep8 's setup.cfg
87+ # Config file read from the pycodestyle 's setup.cfg
8688 config_filenames = [os .path .basename (p )
8789 for p in self ._config_filenames ]
8890 self .assertTrue ('setup.cfg' in config_filenames )
8991
9092 def test_check_stdin (self ):
9193 pycodestyle .PROJECT_CONFIG = ()
92- stdout , stderr , errcode = self .pep8 ('-' )
94+ stdout , stderr , errcode = self .pycodestyle ('-' )
9395 self .assertFalse (errcode )
9496 self .assertFalse (stderr )
9597 self .assertFalse (stdout )
9698
9799 self .stdin = 'import os, sys\n '
98- stdout , stderr , errcode = self .pep8 ('-' )
100+ stdout , stderr , errcode = self .pycodestyle ('-' )
99101 stdout = stdout .splitlines ()
100102 self .assertEqual (errcode , 1 )
101103 self .assertFalse (stderr )
@@ -104,19 +106,19 @@ def test_check_stdin(self):
104106
105107 def test_check_non_existent (self ):
106108 self .stdin = 'import os, sys\n '
107- stdout , stderr , errcode = self .pep8 ('fictitious.py' )
109+ stdout , stderr , errcode = self .pycodestyle ('fictitious.py' )
108110 self .assertEqual (errcode , 1 )
109111 self .assertFalse (stderr )
110112 self .assertTrue (stdout .startswith ('fictitious.py:1:1: E902 ' ))
111113
112114 def test_check_noarg (self ):
113115 # issue #170: do not read stdin by default
114116 pycodestyle .PROJECT_CONFIG = ()
115- stdout , stderr , errcode = self .pep8 ()
117+ stdout , stderr , errcode = self .pycodestyle ()
116118 self .assertEqual (errcode , 2 )
117119 self .assertEqual (stderr .splitlines (),
118- ["Usage: pep8 [options] input ..." , "" ,
119- "pep8 : error: input not specified" ])
120+ ["Usage: pycodestyle [options] input ..." , "" ,
121+ "pycodestyle : error: input not specified" ])
120122 self .assertFalse (self ._config_filenames )
121123
122124 def test_check_diff (self ):
@@ -136,7 +138,7 @@ def test_check_diff(self):
136138 ]
137139
138140 self .stdin = '\n ' .join (diff_lines )
139- stdout , stderr , errcode = self .pep8 ('--diff' )
141+ stdout , stderr , errcode = self .pycodestyle ('--diff' )
140142 stdout = stdout .splitlines ()
141143 self .assertEqual (errcode , 1 )
142144 self .assertFalse (stderr )
@@ -149,7 +151,7 @@ def test_check_diff(self):
149151 diff_lines [:2 ] = ["--- a/testsuite/E11.py 2006-06-01 08:49 +0400" ,
150152 "+++ b/testsuite/E11.py 2008-04-06 17:36 +0400" ]
151153 self .stdin = '\n ' .join (diff_lines )
152- stdout , stderr , errcode = self .pep8 ('--diff' )
154+ stdout , stderr , errcode = self .pycodestyle ('--diff' )
153155 stdout = stdout .splitlines ()
154156 self .assertEqual (errcode , 1 )
155157 self .assertFalse (stderr )
@@ -167,23 +169,25 @@ def test_check_diff(self):
167169 "@@ -5,0 +6 @@ if True:" ,
168170 "+ print" ]
169171 self .stdin = '\n ' .join (diff_lines )
170- stdout , stderr , errcode = self .pep8 ('--diff' )
172+ stdout , stderr , errcode = self .pycodestyle ('--diff' )
171173 (stdout ,) = stdout .splitlines ()
172174 self .assertEqual (errcode , 1 )
173175 self .assertFalse (stderr )
174176 self .assertTrue ('testsuite/E11.py:6:6: E111 ' in stdout )
175177
176178 # missing '--diff'
177179 self .stdin = '\n ' .join (diff_lines )
178- stdout , stderr , errcode = self .pep8 ()
180+ stdout , stderr , errcode = self .pycodestyle ()
179181 self .assertEqual (errcode , 2 )
180182 self .assertFalse (stdout )
181- self .assertTrue (stderr .startswith ('Usage: pep8 [options] input ...' ))
183+ self .assertTrue (stderr .startswith (
184+ 'Usage: pycodestyle [options] input ...'
185+ ))
182186
183187 # no matching file in the diff
184188 diff_lines [3 ] = "+++ b/testsuite/lost/E11.py"
185189 self .stdin = '\n ' .join (diff_lines )
186- stdout , stderr , errcode = self .pep8 ('--diff' )
190+ stdout , stderr , errcode = self .pycodestyle ('--diff' )
187191 self .assertFalse (errcode )
188192 self .assertFalse (stdout )
189193 self .assertFalse (stderr )
0 commit comments