From 577a781de3466d796a8fa05b59aee9eee4a73777 Mon Sep 17 00:00:00 2001 From: Romain Dorgueil Date: Sat, 20 May 2017 10:47:57 +0200 Subject: [PATCH] Deprecation-land cleanup, before 0.3. --- bonobo/_api.py | 11 +++-------- bonobo/config/processors.py | 35 ----------------------------------- bonobo/ext/opendatasoft.py | 7 +------ bonobo/nodes/io/csv.py | 2 +- bonobo/nodes/io/file.py | 2 +- bonobo/nodes/io/json.py | 2 +- 6 files changed, 7 insertions(+), 52 deletions(-) diff --git a/bonobo/_api.py b/bonobo/_api.py index a4ea7ee..85e5a62 100644 --- a/bonobo/_api.py +++ b/bonobo/_api.py @@ -20,7 +20,7 @@ def register_api_group(*args): @register_api -def run(graph, *chain, strategy=None, plugins=None, services=None): +def run(graph, strategy=None, plugins=None, services=None): """ Main entry point of bonobo. It takes a graph and creates all the necessary plumbery around to execute it. @@ -40,21 +40,16 @@ def run(graph, *chain, strategy=None, plugins=None, services=None): :param dict services: The implementations of services this graph will use. :return bonobo.execution.graph.GraphExecutionContext: """ - if len(chain): - warnings.warn('DEPRECATED. You should pass a Graph instance instead of a chain.') - from bonobo import Graph - graph = Graph(graph, *chain) - strategy = create_strategy(strategy) plugins = plugins or [] - if _is_interactive_console(): + if _is_interactive_console(): # pragma: no cover from bonobo.ext.console import ConsoleOutputPlugin if ConsoleOutputPlugin not in plugins: plugins.append(ConsoleOutputPlugin) - if _is_jupyter_notebook(): + if _is_jupyter_notebook(): # pragma: no cover from bonobo.ext.jupyter import JupyterOutputPlugin if JupyterOutputPlugin not in plugins: plugins.append(JupyterOutputPlugin) diff --git a/bonobo/config/processors.py b/bonobo/config/processors.py index 76614fb..61bd5dd 100644 --- a/bonobo/config/processors.py +++ b/bonobo/config/processors.py @@ -85,41 +85,6 @@ class ContextCurrifier: raise RuntimeError('Context processors should not yield more than once.') -@deprecated -def add_context_processor(cls_or_func, context_processor): - getattr(cls_or_func, _CONTEXT_PROCESSORS_ATTR).append(context_processor) - - -@deprecated -def contextual(cls_or_func): - """ - Make sure an element has the context processors collection. - - :param cls_or_func: - """ - if not add_context_processor.__name__ in cls_or_func.__dict__: - setattr(cls_or_func, add_context_processor.__name__, functools.partial(add_context_processor, cls_or_func)) - - if isinstance(cls_or_func, types.FunctionType): - try: - getattr(cls_or_func, _CONTEXT_PROCESSORS_ATTR) - except AttributeError: - setattr(cls_or_func, _CONTEXT_PROCESSORS_ATTR, []) - return cls_or_func - - if not _CONTEXT_PROCESSORS_ATTR in cls_or_func.__dict__: - setattr(cls_or_func, _CONTEXT_PROCESSORS_ATTR, []) - - _processors = getattr(cls_or_func, _CONTEXT_PROCESSORS_ATTR) - for processor in cls_or_func.__dict__.values(): - if isinstance(processor, ContextProcessor): - _processors.append(processor) - - # This is needed for python 3.5, python 3.6 should be fine, but it's considered an implementation detail. - _processors.sort(key=lambda proc: proc._creation_counter) - return cls_or_func - - def resolve_processors(mixed): try: yield from mixed.__processors__ diff --git a/bonobo/ext/opendatasoft.py b/bonobo/ext/opendatasoft.py index 25c1748..4d094e7 100644 --- a/bonobo/ext/opendatasoft.py +++ b/bonobo/ext/opendatasoft.py @@ -3,7 +3,7 @@ from urllib.parse import urlencode import requests # todo: make this a service so we can substitute it ? from bonobo.config import Option -from bonobo.config.processors import ContextProcessor, contextual +from bonobo.config.processors import ContextProcessor from bonobo.config.configurables import Configurable from bonobo.util.compat import deprecated from bonobo.util.objects import ValueHolder @@ -50,11 +50,6 @@ class OpenDataSoftAPI(Configurable): start.value += self.rows -@deprecated -def from_opendatasoft_api(dataset, **kwargs): - return OpenDataSoftAPI(dataset=dataset, **kwargs) - - __all__ = [ 'OpenDataSoftAPI', ] diff --git a/bonobo/nodes/io/csv.py b/bonobo/nodes/io/csv.py index 647925b..6242947 100644 --- a/bonobo/nodes/io/csv.py +++ b/bonobo/nodes/io/csv.py @@ -1,7 +1,7 @@ import csv from bonobo.config import Option -from bonobo.config.processors import ContextProcessor, contextual +from bonobo.config.processors import ContextProcessor from bonobo.constants import NOT_MODIFIED from bonobo.util.objects import ValueHolder from .file import FileHandler, FileReader, FileWriter diff --git a/bonobo/nodes/io/file.py b/bonobo/nodes/io/file.py index 3298fd9..231e570 100644 --- a/bonobo/nodes/io/file.py +++ b/bonobo/nodes/io/file.py @@ -1,6 +1,6 @@ from bonobo.config import Option, Service from bonobo.config.configurables import Configurable -from bonobo.config.processors import ContextProcessor, contextual +from bonobo.config.processors import ContextProcessor from bonobo.constants import NOT_MODIFIED from bonobo.util.objects import ValueHolder diff --git a/bonobo/nodes/io/json.py b/bonobo/nodes/io/json.py index 2c4ea79..fdb49b8 100644 --- a/bonobo/nodes/io/json.py +++ b/bonobo/nodes/io/json.py @@ -1,6 +1,6 @@ import json -from bonobo.config.processors import ContextProcessor, contextual +from bonobo.config.processors import ContextProcessor from .file import FileWriter, FileReader __all__ = [