nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-06-10 11:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/santiago' into santiago

Browse Source
This commit is contained in:
Tom Galloway 2012-06-13 09:54:19 +01:00
commit e215045500
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ugly_hacks/santiago/santiago.py
View File

@ -134,8 +134,6 @@ class Santiago(object):
self.hosting = hosting if hosting else self.load_data("hosting")
self.consuming = consuming if consuming else self.load_data("consuming")
self.require_gpg = require_gpg
def create_connectors(self, data, type):
connectors = self._create_connectors(data, type)
self.protocols |= set(connectors.keys())
@ -388,7 +386,7 @@ class Santiago(object):
debug_log("fail fingerprint {0}".format(str(request.fingerprint)))
return
# copy out only required keys from request, throwing away cruft
# copy out only white-listed keys from request, throwing away cruft
request_body = dict()
source = json.loads((str(request)))
try:
@ -691,7 +689,7 @@ if __name__ == "__main__":
santiago = Santiago(listeners, senders,
hosting, consuming,
me=mykey, monitors=monitors, require_gpg = False)
me=mykey, monitors=monitors)
# import pdb; pdb.set_trace()
with santiago: