From 2ed91f70d78f42943bd4b5dd06dda6c0af5465a8 Mon Sep 17 00:00:00 2001 From: Tom Galloway Date: Mon, 11 Jun 2012 12:44:42 +0100 Subject: [PATCH] Don't try to load listeners/senders/monitors if set to None. Santiago init needed to reference require_gpg. --- ugly_hacks/santiago/santiago.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ugly_hacks/santiago/santiago.py b/ugly_hacks/santiago/santiago.py index 3d0b92a7e..2761a9b6a 100644 --- a/ugly_hacks/santiago/santiago.py +++ b/ugly_hacks/santiago/santiago.py @@ -94,7 +94,7 @@ class Santiago(object): CONTROLLER_MODULE = "protocols.{0}.controller" def __init__(self, listeners = None, senders = None, - hosting = None, consuming = None, me = 0, monitors = None): + hosting = None, consuming = None, me = 0, monitors = None, require_gpg = 0): """Create a Santiago with the specified parameters. listeners and senders are both protocol-specific dictionaries containing @@ -124,9 +124,12 @@ class Santiago(object): self.gpg = gnupg.GPG(use_agent = True) self.protocols = set() - self.listeners = self.create_connectors(listeners, "Listener") - self.senders = self.create_connectors(senders, "Sender") - self.monitors = self.create_connectors(monitors, "Monitor") + if listeners is not None: + self.listeners = self.create_connectors(listeners, "Listener") + if senders is not None: + self.senders = self.create_connectors(senders, "Sender") + if monitors is not None: + self.monitors = self.create_connectors(monitors, "Monitor") self.shelf = shelve.open(str(self.me)) self.hosting = hosting if hosting else self.load_data("hosting")