summaryrefslogtreecommitdiff
path: root/ot
diff options
context:
space:
mode:
authorRémi Flamary <remi.flamary@gmail.com>2018-03-21 10:13:16 +0100
committerRémi Flamary <remi.flamary@gmail.com>2018-03-21 10:13:16 +0100
commit64ef33d09906a1aebd3c8294ffd7720475ab926b (patch)
treec0b7a86de49a237667ceb6dea52b295ffb3197d1 /ot
parent55aaf7874c651235d44c34b89337df7694e55014 (diff)
aupdate gromov + autopep8 externals
Diffstat (limited to 'ot')
-rw-r--r--ot/externals/funcsigs.py56
1 files changed, 29 insertions, 27 deletions
diff --git a/ot/externals/funcsigs.py b/ot/externals/funcsigs.py
index 4e68469..82a55da 100644
--- a/ot/externals/funcsigs.py
+++ b/ot/externals/funcsigs.py
@@ -29,7 +29,7 @@ def formatannotation(annotation, base_module=None):
if isinstance(annotation, type):
if annotation.__module__ in ('builtins', '__builtin__', base_module):
return annotation.__name__
- return annotation.__module__+'.'+annotation.__name__
+ return annotation.__module__ + '.' + annotation.__name__
return repr(annotation)
@@ -127,7 +127,7 @@ def signature(obj):
_partial_kwarg=True)
elif (param.kind not in (_VAR_KEYWORD, _VAR_POSITIONAL) and
- not param._partial_kwarg):
+ not param._partial_kwarg):
new_params.pop(arg_name)
return sig.replace(parameters=new_params.values())
@@ -170,7 +170,8 @@ def signature(obj):
msg = 'no signature found for builtin function {0!r}'.format(obj)
raise ValueError(msg)
- raise ValueError('callable {0!r} is not supported by signature'.format(obj))
+ raise ValueError(
+ 'callable {0!r} is not supported by signature'.format(obj))
class _void(object):
@@ -194,11 +195,11 @@ class _ParameterKind(int):
return '<_ParameterKind: {0!r}>'.format(self._name)
-_POSITIONAL_ONLY = _ParameterKind(0, name='POSITIONAL_ONLY')
-_POSITIONAL_OR_KEYWORD = _ParameterKind(1, name='POSITIONAL_OR_KEYWORD')
-_VAR_POSITIONAL = _ParameterKind(2, name='VAR_POSITIONAL')
-_KEYWORD_ONLY = _ParameterKind(3, name='KEYWORD_ONLY')
-_VAR_KEYWORD = _ParameterKind(4, name='VAR_KEYWORD')
+_POSITIONAL_ONLY = _ParameterKind(0, name='POSITIONAL_ONLY')
+_POSITIONAL_OR_KEYWORD = _ParameterKind(1, name='POSITIONAL_OR_KEYWORD')
+_VAR_POSITIONAL = _ParameterKind(2, name='VAR_POSITIONAL')
+_KEYWORD_ONLY = _ParameterKind(3, name='KEYWORD_ONLY')
+_VAR_KEYWORD = _ParameterKind(4, name='VAR_KEYWORD')
class Parameter(object):
@@ -223,11 +224,11 @@ class Parameter(object):
__slots__ = ('_name', '_kind', '_default', '_annotation', '_partial_kwarg')
- POSITIONAL_ONLY = _POSITIONAL_ONLY
- POSITIONAL_OR_KEYWORD = _POSITIONAL_OR_KEYWORD
- VAR_POSITIONAL = _VAR_POSITIONAL
- KEYWORD_ONLY = _KEYWORD_ONLY
- VAR_KEYWORD = _VAR_KEYWORD
+ POSITIONAL_ONLY = _POSITIONAL_ONLY
+ POSITIONAL_OR_KEYWORD = _POSITIONAL_OR_KEYWORD
+ VAR_POSITIONAL = _VAR_POSITIONAL
+ KEYWORD_ONLY = _KEYWORD_ONLY
+ VAR_KEYWORD = _VAR_KEYWORD
empty = _empty
@@ -253,7 +254,8 @@ class Parameter(object):
self._name = name
else:
name = str(name)
- if kind != _POSITIONAL_ONLY and not re.match(r'[a-z_]\w*$', name, re.I):
+ if kind != _POSITIONAL_ONLY and not re.match(
+ r'[a-z_]\w*$', name, re.I):
msg = '{0!r} is not a valid parameter name'.format(name)
raise ValueError(msg)
self._name = name
@@ -310,7 +312,7 @@ class Parameter(object):
# Add annotation and default value
if self._annotation is not _empty:
formatted = '{0}:{1}'.format(formatted,
- formatannotation(self._annotation))
+ formatannotation(self._annotation))
if self._default is not _empty:
formatted = '{0}={1}'.format(formatted, repr(self._default))
@@ -324,7 +326,7 @@ class Parameter(object):
def __repr__(self):
return '<{0} at {1:#x} {2!r}>'.format(self.__class__.__name__,
- id(self), self.name)
+ id(self), self.name)
def __hash__(self):
msg = "unhashable type: '{0}'".format(self.__class__.__name__)
@@ -371,7 +373,7 @@ class BoundArguments(object):
args = []
for param_name, param in self._signature.parameters.items():
if (param.kind in (_VAR_KEYWORD, _KEYWORD_ONLY) or
- param._partial_kwarg):
+ param._partial_kwarg):
# Keyword arguments mapped by 'functools.partial'
# (Parameter._partial_kwarg is True) are mapped
# in 'BoundArguments.kwargs', along with VAR_KEYWORD &
@@ -401,7 +403,7 @@ class BoundArguments(object):
for param_name, param in self._signature.parameters.items():
if not kwargs_started:
if (param.kind in (_VAR_KEYWORD, _KEYWORD_ONLY) or
- param._partial_kwarg):
+ param._partial_kwarg):
kwargs_started = True
else:
if param_name not in self.arguments:
@@ -501,7 +503,7 @@ class Signature(object):
params[name] = param
else:
params = OrderedDict(((param.name, param)
- for param in parameters))
+ for param in parameters))
self._parameters = params
self._return_annotation = return_annotation
@@ -611,12 +613,12 @@ class Signature(object):
def __eq__(self, other):
if (not issubclass(type(other), Signature) or
- self.return_annotation != other.return_annotation or
- len(self.parameters) != len(other.parameters)):
+ self.return_annotation != other.return_annotation or
+ len(self.parameters) != len(other.parameters)):
return False
other_positions = dict((param, idx)
- for idx, param in enumerate(other.parameters.keys()))
+ for idx, param in enumerate(other.parameters.keys()))
for idx, (param_name, param) in enumerate(self.parameters.items()):
if param.kind == _KEYWORD_ONLY:
@@ -634,7 +636,7 @@ class Signature(object):
return False
else:
if (idx != other_idx or
- param != other.parameters[param_name]):
+ param != other.parameters[param_name]):
return False
return True
@@ -687,7 +689,7 @@ class Signature(object):
parameters_ex = (param,)
break
elif (param.kind == _VAR_KEYWORD or
- param.default is not _empty):
+ param.default is not _empty):
# That's fine too - we have a default value for this
# parameter. So, lets start parsing `kwargs`, starting
# with the current parameter
@@ -737,7 +739,7 @@ class Signature(object):
# Signature object (but let's have this check here
# to ensure correct behaviour just in case)
raise TypeError('{arg!r} parameter is positional only, '
- 'but was passed as a keyword'. \
+ 'but was passed as a keyword'.
format(arg=param.name))
if param.kind == _VAR_KEYWORD:
@@ -754,8 +756,8 @@ class Signature(object):
# parameter, left alone by the processing of positional
# arguments.
if (not partial and param.kind != _VAR_POSITIONAL and
- param.default is _empty):
- raise TypeError('{arg!r} parameter lacking default value'. \
+ param.default is _empty):
+ raise TypeError('{arg!r} parameter lacking default value'.
format(arg=param_name))
else: