[CalendarServer-changes] [13936] CalendarServer/trunk/calendarserver/tools/diagnose.py

[source_changes at macosforge.org]

Revision: 13936
          http://trac.calendarserver.org//changeset/13936
Author:   sagen at apple.com
Date:     2014-09-03 09:28:00 -0700 (Wed, 03 Sep 2014)
Log Message:
-----------
Handle non-ascii server root

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/diagnose.py

Modified: CalendarServer/trunk/calendarserver/tools/diagnose.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/diagnose.py	2014-09-03 15:01:12 UTC (rev 13935)
+++ CalendarServer/trunk/calendarserver/tools/diagnose.py	2014-09-03 16:28:00 UTC (rev 13936)
@@ -101,16 +101,16 @@
         print("{} does not exist (but that's ok)".format(PREFS_PLIST))
 
     serverRoot = getServerRoot()
-    print("Prefs plist says ServerRoot directory is: {}".format(serverRoot))
+    print("Prefs plist says ServerRoot directory is: {}".format(serverRoot.encode("utf-8")))
 
     systemPlist = os.path.join(serverRoot, "Config", "caldavd-system.plist")
     try:
         if checkPlist(systemPlist):
-            print("{} exists and can be parsed".format(systemPlist))
+            print("{} exists and can be parsed".format(systemPlist.encode("utf-8")))
         else:
-            print("{} exists but cannot be parsed".format(systemPlist))
+            print("{} exists but cannot be parsed".format(systemPlist.encode("utf-8")))
     except FileNotFound:
-        print("{} does not exist".format(systemPlist))
+        print("{} does not exist".format(systemPlist.encode("utf-8")))
 
 
     keys = showConfigKeys()
@@ -240,7 +240,7 @@
     clusterPath = os.path.join(serverRoot, "Data", "Database.xpg", "cluster.pg")
 
     print()
-    print("Postgres status for cluster {}:".format(clusterPath))
+    print("Postgres status for cluster {}:".format(clusterPath.encode("utf-8")))
 
     code, stdout, stderr = runCommand(
         "/usr/bin/sudo",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140903/44665d27/attachment-0001.html>