@@ -28,7 +28,7 @@ def formatannotation(annotation, base_module=None):
28
28
if isinstance (annotation , type ):
29
29
if annotation .__module__ in ('builtins' , '__builtin__' , base_module ):
30
30
return annotation .__name__
31
- return annotation .__module__ + '.' + annotation .__name__
31
+ return annotation .__module__ + '.' + annotation .__name__
32
32
return repr (annotation )
33
33
34
34
@@ -126,7 +126,7 @@ def signature(obj):
126
126
_partial_kwarg = True )
127
127
128
128
elif (param .kind not in (_VAR_KEYWORD , _VAR_POSITIONAL ) and
129
- not param ._partial_kwarg ):
129
+ not param ._partial_kwarg ):
130
130
new_params .pop (arg_name )
131
131
132
132
return sig .replace (parameters = new_params .values ())
@@ -193,11 +193,11 @@ def __repr__(self):
193
193
return '<_ParameterKind: {0!r}>' .format (self ._name )
194
194
195
195
196
- _POSITIONAL_ONLY = _ParameterKind (0 , name = 'POSITIONAL_ONLY' )
197
- _POSITIONAL_OR_KEYWORD = _ParameterKind (1 , name = 'POSITIONAL_OR_KEYWORD' )
198
- _VAR_POSITIONAL = _ParameterKind (2 , name = 'VAR_POSITIONAL' )
199
- _KEYWORD_ONLY = _ParameterKind (3 , name = 'KEYWORD_ONLY' )
200
- _VAR_KEYWORD = _ParameterKind (4 , name = 'VAR_KEYWORD' )
196
+ _POSITIONAL_ONLY = _ParameterKind (0 , name = 'POSITIONAL_ONLY' )
197
+ _POSITIONAL_OR_KEYWORD = _ParameterKind (1 , name = 'POSITIONAL_OR_KEYWORD' )
198
+ _VAR_POSITIONAL = _ParameterKind (2 , name = 'VAR_POSITIONAL' )
199
+ _KEYWORD_ONLY = _ParameterKind (3 , name = 'KEYWORD_ONLY' )
200
+ _VAR_KEYWORD = _ParameterKind (4 , name = 'VAR_KEYWORD' )
201
201
202
202
203
203
class Parameter (object ):
@@ -220,11 +220,11 @@ class Parameter(object):
220
220
221
221
__slots__ = ('_name' , '_kind' , '_default' , '_annotation' , '_partial_kwarg' )
222
222
223
- POSITIONAL_ONLY = _POSITIONAL_ONLY
224
- POSITIONAL_OR_KEYWORD = _POSITIONAL_OR_KEYWORD
225
- VAR_POSITIONAL = _VAR_POSITIONAL
226
- KEYWORD_ONLY = _KEYWORD_ONLY
227
- VAR_KEYWORD = _VAR_KEYWORD
223
+ POSITIONAL_ONLY = _POSITIONAL_ONLY
224
+ POSITIONAL_OR_KEYWORD = _POSITIONAL_OR_KEYWORD
225
+ VAR_POSITIONAL = _VAR_POSITIONAL
226
+ KEYWORD_ONLY = _KEYWORD_ONLY
227
+ VAR_KEYWORD = _VAR_KEYWORD
228
228
229
229
empty = _empty
230
230
@@ -366,7 +366,7 @@ def args(self):
366
366
args = []
367
367
for param_name , param in self ._signature .parameters .items ():
368
368
if (param .kind in (_VAR_KEYWORD , _KEYWORD_ONLY ) or
369
- param ._partial_kwarg ):
369
+ param ._partial_kwarg ):
370
370
# Keyword arguments mapped by 'functools.partial'
371
371
# (Parameter._partial_kwarg is True) are mapped
372
372
# in 'BoundArguments.kwargs', along with VAR_KEYWORD &
@@ -396,7 +396,7 @@ def kwargs(self):
396
396
for param_name , param in self ._signature .parameters .items ():
397
397
if not kwargs_started :
398
398
if (param .kind in (_VAR_KEYWORD , _KEYWORD_ONLY ) or
399
- param ._partial_kwarg ):
399
+ param ._partial_kwarg ):
400
400
kwargs_started = True
401
401
else :
402
402
if param_name not in self .arguments :
@@ -494,7 +494,7 @@ def __init__(self, parameters=None, return_annotation=_empty,
494
494
params [name ] = param
495
495
else :
496
496
params = OrderedDict (((param .name , param )
497
- for param in parameters ))
497
+ for param in parameters ))
498
498
499
499
self ._parameters = params
500
500
self ._return_annotation = return_annotation
@@ -604,8 +604,8 @@ def __hash__(self):
604
604
605
605
def __eq__ (self , other ):
606
606
if (not issubclass (type (other ), Signature ) or
607
- self .return_annotation != other .return_annotation or
608
- len (self .parameters ) != len (other .parameters )):
607
+ self .return_annotation != other .return_annotation or
608
+ len (self .parameters ) != len (other .parameters )):
609
609
return False
610
610
611
611
other_positions = dict ((param , idx )
@@ -627,7 +627,7 @@ def __eq__(self, other):
627
627
return False
628
628
else :
629
629
if (idx != other_idx or
630
- param != other .parameters [param_name ]):
630
+ param != other .parameters [param_name ]):
631
631
return False
632
632
633
633
return True
@@ -680,7 +680,7 @@ def _bind(self, args, kwargs, partial=False):
680
680
parameters_ex = (param ,)
681
681
break
682
682
elif (param .kind == _VAR_KEYWORD or
683
- param .default is not _empty ):
683
+ param .default is not _empty ):
684
684
# That's fine too - we have a default value for this
685
685
# parameter. So, lets start parsing `kwargs`, starting
686
686
# with the current parameter
@@ -730,7 +730,7 @@ def _bind(self, args, kwargs, partial=False):
730
730
# Signature object (but let's have this check here
731
731
# to ensure correct behaviour just in case)
732
732
raise TypeError ('{arg!r} parameter is positional only, '
733
- 'but was passed as a keyword' . \
733
+ 'but was passed as a keyword' .
734
734
format (arg = param .name ))
735
735
736
736
if param .kind == _VAR_KEYWORD :
@@ -747,8 +747,8 @@ def _bind(self, args, kwargs, partial=False):
747
747
# parameter, left alone by the processing of positional
748
748
# arguments.
749
749
if (not partial and param .kind != _VAR_POSITIONAL and
750
- param .default is _empty ):
751
- raise TypeError ('{arg!r} parameter lacking default value' . \
750
+ param .default is _empty ):
751
+ raise TypeError ('{arg!r} parameter lacking default value' .
752
752
format (arg = param_name ))
753
753
754
754
else :
0 commit comments