Skip to content

Commit d48eef0

Browse files
committed
Generalize deprecation avoidance
1 parent 067a321 commit d48eef0

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

pep8.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,6 +1314,13 @@ def _is_eol_token(token, _eol_token=_is_eol_token):
13141314
_checks = {'physical_line': {}, 'logical_line': {}, 'tree': {}}
13151315

13161316

1317+
def _get_parameters(function):
1318+
if sys.version_info >= (3, 3):
1319+
return list(inspect.signature(function).parameters)
1320+
else:
1321+
return inspect.getargspec(function)[0]
1322+
1323+
13171324
def register_check(check, codes=None):
13181325
"""Register a new check object."""
13191326
def _add_check(check, kind, codes, args):
@@ -1322,18 +1329,13 @@ def _add_check(check, kind, codes, args):
13221329
else:
13231330
_checks[kind][check] = (codes or [''], args)
13241331
if inspect.isfunction(check):
1325-
args = inspect.getargspec(check)[0]
1332+
args = _get_parameters(check)
13261333
if args and args[0] in ('physical_line', 'logical_line'):
13271334
if codes is None:
13281335
codes = ERRORCODE_REGEX.findall(check.__doc__ or '')
13291336
_add_check(check, args[0], codes, args)
13301337
elif inspect.isclass(check):
1331-
if sys.version_info >= (3, 3):
1332-
parameters = list(inspect.signature(check.__init__).parameters)
1333-
else:
1334-
parameters = inspect.getargspec(check.__init__)[0]
1335-
1336-
if parameters[:2] == ['self', 'tree']:
1338+
if _get_parameters(check.__init__)[:2] == ['self', 'tree']:
13371339
_add_check(check, 'tree', codes, None)
13381340

13391341

0 commit comments

Comments
 (0)