paulin/bonobo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[misc] Fixes formatting.

Browse Source
This commit is contained in:
Romain Dorgueil
2017-07-05 13:09:46 +02:00
parent 8de6f50523
commit 4a2c7280d6
9 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bonobo/config/configurables.py
View File

@ -51,7 +51,7 @@ class ConfigurableMeta(type):
return (processor for _, processor in cls.__processors)
def __repr__(self):
return ' '.join(('<Configurable', super(ConfigurableMeta, self).__repr__().split(' ', 1)[1],))
return ' '.join(('<Configurable', super(ConfigurableMeta, self).__repr__().split(' ', 1)[1], ))
try:
@ -61,6 +61,7 @@ except:
PartiallyConfigured = functools.partial
else:
class PartiallyConfigured(_functools.partial):
@property # TODO XXX cache this shit
def _options_values(self):
@ -160,9 +161,7 @@ class Configurable(metaclass=ConfigurableMeta):
def __init__(self, *args, **kwargs):
# initialize option's value dictionary, used by descriptor implementation (see Option).
self._options_values = {
**kwargs
}
self._options_values = {**kwargs}
# set option values.
for name, value in kwargs.items():

9
bonobo/config/options.py
View File

@ -130,13 +130,12 @@ class Method(Option):
def __set__(self, inst, value):
if not hasattr(value, '__call__'):
raise TypeError('Option of type {!r} is expecting a callable value, got {!r} object (which is not).'.format(
type(self).__name__, type(value).__name__))
raise TypeError(
'Option of type {!r} is expecting a callable value, got {!r} object (which is not).'.
format(type(self).__name__, type(value).__name__)
)
inst._options_values[self.name] = self.type(value) if self.type else value
def __call__(self, *args, **kwargs):
# only here to trick IDEs into thinking this is callable.
raise NotImplementedError('You cannot call the descriptor')

6
bonobo/examples/datasets/fablabs.py
View File

@ -73,15 +73,15 @@ def display(row):
print(
' - {}address{}: {address}'.
format(Fore.BLUE, Style.RESET_ALL, address=', '.join(address))
format(Fore.BLUE, Style.RESET_ALL, address=', '.join(address))
)
print(
' - {}links{}: {links}'.
format(Fore.BLUE, Style.RESET_ALL, links=', '.join(row['links']))
format(Fore.BLUE, Style.RESET_ALL, links=', '.join(row['links']))
)
print(
' - {}geometry{}: {geometry}'.
format(Fore.BLUE, Style.RESET_ALL, **row)
format(Fore.BLUE, Style.RESET_ALL, **row)
)
print(
' - {}source{}: {source}'.format(

4
bonobo/nodes/io/base.py
View File

@ -12,7 +12,7 @@ class IOFormatEnabled(Configurable):
if len(args) != 1 or len(kwargs):
raise UnrecoverableValueError(
'Wrong input formating: IOFORMAT=ARG0 implies one arg and no kwargs, got args={!r} and kwargs={!r}.'.
format(args, kwargs)
format(args, kwargs)
)
return args[0]
@ -20,7 +20,7 @@ class IOFormatEnabled(Configurable):
if len(args) or not len(kwargs):
raise UnrecoverableValueError(
'Wrong input formating: IOFORMAT=KWARGS ioformat implies no arg, got args={!r} and kwargs={!r}.'.
format(args, kwargs)
format(args, kwargs)
)
return kwargs

20
bonobo/util/inspect.py
View File

@ -68,14 +68,15 @@ def istype(mixed):
return isinstance(mixed, type)
ConfigurableInspection = namedtuple('ConfigurableInspection',
[
'type',
'instance',
'options',
'processors',
'partial',
])
ConfigurableInspection = namedtuple(
'ConfigurableInspection', [
'type',
'instance',
'options',
'processors',
'partial',
]
)
ConfigurableInspection.__enter__ = lambda self: self
ConfigurableInspection.__exit__ = lambda *exc_details: None
@ -103,7 +104,8 @@ def inspect_node(mixed, *, _partial=None):
return inspect_node(mixed.func, _partial=(mixed.args, mixed.keywords))
else:
raise TypeError(
'Not a Configurable, nor a Configurable instance and not even a partially configured Configurable. Check your inputs.')
'Not a Configurable, nor a Configurable instance and not even a partially configured Configurable. Check your inputs.'
)
return ConfigurableInspection(
typ,

1
tests/config/test_configurables.py
View File

@ -134,4 +134,3 @@ def test_no_opt_configurable():
with inspect_node(o) as ni:
assert not ni.partial

10
tests/config/test_methods.py
View File

@ -50,7 +50,7 @@ def test_define_with_decorator():
calls = []
def my_handler(*args, **kwargs):
calls.append((args, kwargs,))
calls.append((args, kwargs, ))
Concrete = MethodBasedConfigurable(my_handler)
@ -74,7 +74,7 @@ def test_late_binding_method_decoration():
@MethodBasedConfigurable(foo='foo')
def Concrete(*args, **kwargs):
calls.append((args, kwargs,))
calls.append((args, kwargs, ))
assert callable(Concrete.handler)
t = Concrete(bar='baz')
@ -89,7 +89,7 @@ def test_define_with_argument():
calls = []
def concrete_handler(*args, **kwargs):
calls.append((args, kwargs,))
calls.append((args, kwargs, ))
t = MethodBasedConfigurable(concrete_handler, 'foo', bar='baz')
assert callable(t.handler)
@ -103,7 +103,7 @@ def test_define_with_inheritance():
class Inheriting(MethodBasedConfigurable):
def handler(self, *args, **kwargs):
calls.append((args, kwargs,))
calls.append((args, kwargs, ))
t = Inheriting('foo', bar='baz')
assert callable(t.handler)
@ -120,7 +120,7 @@ def test_inheritance_then_decorate():
@Inheriting
def Concrete(*args, **kwargs):
calls.append((args, kwargs,))
calls.append((args, kwargs, ))
assert callable(Concrete.handler)
t = Concrete('foo', bar='baz')

4
tests/config/test_methods_partial.py
View File

@ -40,7 +40,7 @@ def test_partial():
assert len(ci.options) == 4
assert len(ci.processors) == 1
assert ci.partial
assert ci.partial[0] == (f1,)
assert ci.partial[0] == (f1, )
assert not len(ci.partial[1])
# instanciate a more complete partial instance ...
@ -53,7 +53,7 @@ def test_partial():
assert len(ci.options) == 4
assert len(ci.processors) == 1
assert ci.partial
assert ci.partial[0] == (f1, f2,)
assert ci.partial[0] == (f1, f2, )
assert not len(ci.partial[1])
c = C('foo')

8
tests/config/test_services.py
View File

@ -99,9 +99,7 @@ def test_exclusive():
def test_requires():
vcr = VCR()
services = Container(
output=vcr.append
)
services = Container(output=vcr.append)
@requires('output')
def append(out, x):
@ -110,7 +108,3 @@ def test_requires():
svcargs = services.args_for(append)
assert len(svcargs) == 1
assert svcargs[0] == vcr.append