[CalendarServer-changes] [5605] CalendarServer/trunk/calendarserver/tools
source_changes at macosforge.org
source_changes at macosforge.org
Fri May 14 14:23:05 PDT 2010
Revision: 5605
http://trac.macosforge.org/projects/calendarserver/changeset/5605
Author: sagen at apple.com
Date: 2010-05-14 14:23:03 -0700 (Fri, 14 May 2010)
Log Message:
-----------
Pretty-print principals in calendarserver_manage_principals
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/tools/principals.py
CalendarServer/trunk/calendarserver/tools/test/test_principals.py
Modified: CalendarServer/trunk/calendarserver/tools/principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/principals.py 2010-05-14 20:19:35 UTC (rev 5604)
+++ CalendarServer/trunk/calendarserver/tools/principals.py 2010-05-14 21:23:03 UTC (rev 5605)
@@ -491,7 +491,8 @@
for proxyType in proxyTypes:
subPrincipal = proxySubprincipal(principal, proxyType)
if subPrincipal is None:
- print "No %s proxies for %s" % (proxyType, principal)
+ print "No %s proxies for %s" % (proxyType,
+ prettyPrincipal(principal))
continue
membersProperty = (yield subPrincipal.readProperty(davxml.GroupMemberSet, None))
@@ -499,7 +500,7 @@
if membersProperty.children:
print "%s proxies for %s:" % (
{"read": "Read-only", "write": "Read/write"}[proxyType],
- principal,
+ prettyPrincipal(principal)
)
records = []
for member in membersProperty.children:
@@ -510,7 +511,8 @@
printRecordList(records)
print
else:
- print "No %s proxies for %s" % (proxyType, principal)
+ print "No %s proxies for %s" % (proxyType,
+ prettyPrincipal(principal))
@inlineCallbacks
def action_addProxy(principal, proxyType, *proxyIDs):
@@ -525,7 +527,9 @@
def action_addProxyPrincipal(principal, proxyType, proxyPrincipal):
try:
(yield addProxy(principal, proxyType, proxyPrincipal))
- print "Added %s as a %s proxy for %s" % (proxyPrincipal, proxyType, principal)
+ print "Added %s as a %s proxy for %s" % (
+ prettyPrincipal(proxyPrincipal), proxyType,
+ prettyPrincipal(principal))
except ProxyError, e:
print "Error:", e
except ProxyWarning, e:
@@ -537,13 +541,16 @@
subPrincipal = proxySubprincipal(principal, proxyType)
if subPrincipal is None:
- raise ProxyError("Unable to edit %s proxies for %s\n" % (proxyType, principal))
+ raise ProxyError("Unable to edit %s proxies for %s\n" % (proxyType,
+ prettyPrincipal(principal)))
membersProperty = (yield subPrincipal.readProperty(davxml.GroupMemberSet, None))
for memberURL in membersProperty.children:
if str(memberURL) == proxyURL:
- raise ProxyWarning("%s is already a %s proxy for %s" % (proxyPrincipal, proxyType, principal))
+ raise ProxyWarning("%s is already a %s proxy for %s" % (
+ prettyPrincipal(proxyPrincipal), proxyType,
+ prettyPrincipal(principal)))
else:
memberURLs = list(membersProperty.children)
@@ -584,7 +591,8 @@
subPrincipal = proxySubprincipal(principal, proxyType)
if subPrincipal is None:
- raise ProxyError("Unable to edit %s proxies for %s\n" % (proxyType, principal))
+ raise ProxyError("Unable to edit %s proxies for %s\n" % (proxyType,
+ prettyPrincipal(principal)))
membersProperty = (yield subPrincipal.readProperty(davxml.GroupMemberSet, None))
@@ -608,9 +616,8 @@
else:
print "Setting auto-schedule to %s for %s" % (
{ True: "true", False: "false" }[autoSchedule],
- principal,
+ prettyPrincipal(principal),
)
- # (yield principal.setAutoSchedule(autoSchedule))
(yield updateRecord(False, config.directory,
principal.record.recordType,
@@ -624,31 +631,11 @@
def action_getAutoSchedule(principal):
autoSchedule = principal.getAutoSchedule()
print "Autoschedule for %s is %s" % (
- principal,
+ prettyPrincipal(principal),
{ True: "true", False: "false" }[autoSchedule],
)
- at inlineCallbacks
-def action_searchPrincipals(principal, *proxyTypes):
- for proxyType in proxyTypes:
- subPrincipal = proxySubprincipal(principal, proxyType)
- if subPrincipal is None:
- print "No %s proxies for %s" % (proxyType, principal)
- continue
- membersProperty = (yield subPrincipal.readProperty(davxml.GroupMemberSet, None))
-
- if membersProperty.children:
- print "%s proxies for %s:" % (
- {"read": "Read-only", "write": "Read/write"}[proxyType],
- principal,
- )
- for member in membersProperty.children:
- print " *", member
- else:
- print "No %s proxies for %s" % (proxyType, principal)
-
-
def abort(msg, status=1):
sys.stdout.write("%s\n" % (msg,))
try:
@@ -720,7 +707,12 @@
for fullName, shortName, guid in results:
print format % (fullName, shortName, guid)
+def prettyPrincipal(principal):
+ record = principal.record
+ return "\"%s\" (%s:%s)" % (record.fullName, record.recordType,
+ record.shortNames[0])
+
@inlineCallbacks
def updateRecord(create, directory, recordType, **kwargs):
"""
Modified: CalendarServer/trunk/calendarserver/tools/test/test_principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/test/test_principals.py 2010-05-14 20:19:35 UTC (rev 5604)
+++ CalendarServer/trunk/calendarserver/tools/test/test_principals.py 2010-05-14 21:23:03 UTC (rev 5605)
@@ -125,7 +125,7 @@
results = yield self.runCommand("--get-auto-schedule",
"resources:newresource")
- self.assertTrue(results.startswith("Autoschedule for (resources)newresource is true"))
+ self.assertTrue(results.startswith('Autoschedule for "New Resource" (resources:newresource) is true'))
results = yield self.runCommand("--list-principals=resources")
self.assertTrue("newresource" in results)
@@ -180,7 +180,7 @@
def test_modifyWriteProxies(self):
results = yield self.runCommand("--add-write-proxy=users:user01",
"locations:location01")
- self.assertTrue(results.startswith("Added (users)user01 as a write proxy for (locations)location01"))
+ self.assertTrue(results.startswith('Added "Test User 01" (users:user01) as a write proxy for "Room 01" (locations:location01)'))
results = yield self.runCommand("--list-write-proxies",
"locations:location01")
@@ -191,13 +191,13 @@
results = yield self.runCommand("--list-write-proxies",
"locations:location01")
- self.assertTrue("No write proxies for (locations)location01" in results)
+ self.assertTrue('No write proxies for "Room 01" (locations:location01)' in results)
@inlineCallbacks
def test_modifyReadProxies(self):
results = yield self.runCommand("--add-read-proxy=users:user01",
"locations:location01")
- self.assertTrue(results.startswith("Added (users)user01 as a read proxy for (locations)location01"))
+ self.assertTrue(results.startswith('Added "Test User 01" (users:user01) as a read proxy for "Room 01" (locations:location01)'))
results = yield self.runCommand("--list-read-proxies",
"locations:location01")
@@ -208,22 +208,22 @@
results = yield self.runCommand("--list-read-proxies",
"locations:location01")
- self.assertTrue("No read proxies for (locations)location01" in results)
+ self.assertTrue('No read proxies for "Room 01" (locations:location01)' in results)
@inlineCallbacks
def test_autoSchedule(self):
results = yield self.runCommand("--get-auto-schedule",
"locations:location01")
- self.assertTrue(results.startswith("Autoschedule for (locations)location01 is false"))
+ self.assertTrue(results.startswith('Autoschedule for "Room 01" (locations:location01) is false'))
results = yield self.runCommand("--set-auto-schedule=true",
"locations:location01")
- self.assertTrue(results.startswith("Setting auto-schedule to true for (locations)location01"))
+ self.assertTrue(results.startswith('Setting auto-schedule to true for "Room 01" (locations:location01)'))
results = yield self.runCommand("--get-auto-schedule",
"locations:location01")
- self.assertTrue(results.startswith("Autoschedule for (locations)location01 is true"))
+ self.assertTrue(results.startswith('Autoschedule for "Room 01" (locations:location01) is true'))
@inlineCallbacks
def test_updateRecord(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100514/c6b4074d/attachment.html>
More information about the calendarserver-changes
mailing list