Merge branch 'master' into 3031-replace-pycryptopp

This commit is contained in:
meejah
2019-06-26 14:42:43 -06:00
23 changed files with 354 additions and 33 deletions

View File

@ -205,7 +205,7 @@ def create_client(basedir=u".", _client_factory=None):
_client_factory=_client_factory,
)
except Exception:
return Failure()
return defer.fail()
def create_client_from_config(config, _client_factory=None):
@ -259,7 +259,7 @@ def create_client_from_config(config, _client_factory=None):
storage_broker.setServiceParent(client)
return defer.succeed(client)
except Exception:
return Failure()
return defer.fail()
def _sequencer(config):