Fix a bug in userFilename that left us with a directory in ./~/. Add a facility for controller-readable log messages with --controller-log-format

git-svn-id: file:///home/or/svnrepo/updater/trunk@17367 55e972cd-5a19-0410-ae62-a4d7a52db4cd

1 files changed, 7 insertions, 7 deletions

diff --git a/lib/thandy/formats.py b/lib/thandy/formats.py
index 1fd0eb1..f0a4e30 100644
--- a/lib/thandy/formats.py
+++ b/lib/thandy/formats.py
@@ -157,17 +157,17 @@ def checkSignatures(signed, keyDB, role=None, path=None):
 
     return SignatureStatus(goodSigs, badSigs, unknownSigs, tangentialSigs)
 
+def canonical_str_encoder(s):
+    s = '"%s"' % re.sub(r'(["\\])', r'\\\1', s)
+    if isinstance(s, unicode):
+        return s.encode("utf-8")
+    else:
+        return s
+
 def _encodeCanonical(obj, outf):
     # Helper for encodeCanonical.  Older versions of json.encoder don't
     # even let us replace the separators.
 
-    def canonical_str_encoder(s):
-        s = '"%s"' % re.sub(r'(["\\])', r'\\\1', s)
-        if isinstance(s, unicode):
-            return s.encode("utf-8")
-        else:
-            return s
-
     if isinstance(obj, basestring):
         outf(canonical_str_encoder(obj))
     elif obj is True: