From 1dd8d1c2ab4640f3b4058e02b691f13dc41c6832 Mon Sep 17 00:00:00 2001 From: Romain Dorgueil Date: Mon, 26 Dec 2016 13:04:30 +0100 Subject: [PATCH 1/4] landscape code quality --- bonobo/util/iterators.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/bonobo/util/iterators.py b/bonobo/util/iterators.py index c9bd645..5729c25 100644 --- a/bonobo/util/iterators.py +++ b/bonobo/util/iterators.py @@ -1,7 +1,17 @@ -def force_iterator(x): - if isinstance(x, str): - return [x] +""" Iterator utilities """ + + +def force_iterator(mixed): + """Sudo make me an iterator. + + Deprecated. + + :param mixed: + :return: Iterator, baby. + """ + if isinstance(mixed, str): + return [mixed] try: - return iter(x) - except Exception as e: - return [x] if x else [] + return iter(mixed) + except TypeError: + return [mixed] if mixed else [] From efec3b9a7d741a4c5f252f19362c09b6de8341e6 Mon Sep 17 00:00:00 2001 From: Romain Dorgueil Date: Mon, 26 Dec 2016 13:07:05 +0100 Subject: [PATCH 2/4] landscape code quality --- .landscape.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.landscape.yml b/.landscape.yml index e850bb9..6fa2051 100644 --- a/.landscape.yml +++ b/.landscape.yml @@ -8,6 +8,7 @@ python-targets: ignore-paths: - docs - examples + - tests pep257: disable: - D205 From f9cfe23569f235540e8c5552b97ca749cda71c6d Mon Sep 17 00:00:00 2001 From: Romain Dorgueil Date: Mon, 26 Dec 2016 13:47:16 +0100 Subject: [PATCH 3/4] removing couchdb extension as it is not mature --- bonobo/ext/couchdb_.py | 60 ------------------------------------------ 1 file changed, 60 deletions(-) delete mode 100644 bonobo/ext/couchdb_.py diff --git a/bonobo/ext/couchdb_.py b/bonobo/ext/couchdb_.py deleted file mode 100644 index c76c6fe..0000000 --- a/bonobo/ext/couchdb_.py +++ /dev/null @@ -1,60 +0,0 @@ -from bonobo import inject - -try: - import couchdb -except ImportError as e: - import logging - - logging.exception('You must install couchdb to use the bonobo couchdb extension. Easiest way is to install the ' - 'optional "couchdb" dependencies with «pip install bonobo[couchdb]», but you can also install a ' - 'specific version by yourself.') - -import datetime - -from bonobo import service - - -@service -def client(username, password): - client = couchdb.Server() - client.resource.credentials = ( - username, - password, ) - return client - - -@service -@inject(client) -def database(client, name): - return client[name] - - -def json_datetime(dt=None): - dt = dt or datetime.datetime.now() - return dt.replace(microsecond=0).isoformat() + 'Z' - - -@inject(database) -def query(db, map, reduce, *args, **kwargs): - pass - - -cli1 = client.define('admin', 'admin') -cli2 = client.define('foo', 'bar') - - -@inject(client[cli1]) -def print_db(db): - print(db) - - -@inject(client[cli2]) -def print_db2(db): - print(db) - - -if __name__ == '__main__': - print_db() - print_db2() - print_db() - print_db2() From 39cfd72761e43cec796925ce9a1af9046eb0a812 Mon Sep 17 00:00:00 2001 From: Romain Dorgueil Date: Mon, 26 Dec 2016 13:49:40 +0100 Subject: [PATCH 4/4] cleanup iterator utils --- bonobo/util/iterators.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bonobo/util/iterators.py b/bonobo/util/iterators.py index 5729c25..69bb75b 100644 --- a/bonobo/util/iterators.py +++ b/bonobo/util/iterators.py @@ -1,10 +1,10 @@ -""" Iterator utilities """ +""" Iterator utilities. """ def force_iterator(mixed): """Sudo make me an iterator. - Deprecated. + Deprecated? :param mixed: :return: Iterator, baby.