From 329e92ab86d9dbfc3bc8b18c2c261ef176d9c59f Mon Sep 17 00:00:00 2001
From: Nick Daly <Nick.M.Daly@gmail.com>
Date: Tue, 15 May 2012 08:58:15 -0500
Subject: [PATCH] Fixed imports.

---
 ugly_hacks/santiago/pgpprocessor.py    |  2 +-
 ugly_hacks/santiago/protocols/https.py |  2 +-
 ugly_hacks/santiago/santiago.py        | 13 ++++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ugly_hacks/santiago/pgpprocessor.py b/ugly_hacks/santiago/pgpprocessor.py
index a8ab14598..778650716 100644
--- a/ugly_hacks/santiago/pgpprocessor.py
+++ b/ugly_hacks/santiago/pgpprocessor.py
@@ -6,7 +6,7 @@ an onion-wrapped PGP message.
 FIXME: replace this with a real library.  Why doesn't gnupg do this?
 
 """
-from errors import InvalidSignatureError
+from utilities import InvalidSignatureError
 import gnupg
 import re
 
diff --git a/ugly_hacks/santiago/protocols/https.py b/ugly_hacks/santiago/protocols/https.py
index 209c47f8c..a130d3a80 100644
--- a/ugly_hacks/santiago/protocols/https.py
+++ b/ugly_hacks/santiago/protocols/https.py
@@ -1,6 +1,6 @@
 """The HTTPS Santiago listener and sender."""
 
-from simplesantiago import SantiagoListener, SantiagoSender
+from santiago import SantiagoListener, SantiagoSender
 
 import cherrypy
 import httplib, urllib, urlparse
diff --git a/ugly_hacks/santiago/santiago.py b/ugly_hacks/santiago/santiago.py
index 427d6c584..1ca37ec0b 100644
--- a/ugly_hacks/santiago/santiago.py
+++ b/ugly_hacks/santiago/santiago.py
@@ -2,6 +2,12 @@
 
 """The Santiago service.
 
+Santiago is designed to let users negotiate services without third party
+interference.  By sending OpenPGP signed and encrypted messages over HTTPS (or
+other protocols) between parties, I hope to reduce or even prevent MITM attacks.
+Santiago can also use the Tor network as a proxy (with Python 2.7 or later),
+allowing this negotiation to happen very quietly.
+
 Start me with:
 
     $ python -i santiago.py
@@ -35,13 +41,14 @@ or later.  A copy of GPLv3 is available [from the Free Software Foundation]
 import ast
 import cfg
 from collections import defaultdict as DefaultDict
-from errors import InvalidSignatureError, UnwillingHostError
 import gnupg
 import logging
-from pgpprocessor import Unwrapper
 import re
 import sys
 
+from pgpprocessor import Unwrapper
+import utilities
+
 
 class Santiago(object):
     """This Santiago is a less extensible Santiago.
@@ -513,7 +520,7 @@ if __name__ == "__main__":
     logging.getLogger().setLevel(logging.DEBUG)
 
     cert = "santiago.crt"
-    mykey = load_config("production.cfg").get("pgpprocessor", "keyid")
+    mykey = utilities.load_config("production.cfg").get("pgpprocessor", "keyid")
 
     listeners = { "https": { "socket_port": 8080,
                              "ssl_certificate": cert,