[CalendarServer-changes] [7337] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Apr 20 13:30:00 PDT 2011
Revision: 7337
http://trac.macosforge.org/projects/calendarserver/changeset/7337
Author: cdaboo at apple.com
Date: 2011-04-20 13:30:00 -0700 (Wed, 20 Apr 2011)
Log Message:
-----------
Test i18n CN parameter inserts. Also don't use @apple.com addresses in tests.
Modified Paths:
--------------
CalendarServer/trunk/conf/auth/accounts-test.xml
CalendarServer/trunk/twistedcaldav/resource.py
CalendarServer/trunk/twistedcaldav/scheduling/ischedule.py
CalendarServer/trunk/twistedcaldav/upgrade.py
CalendarServer/trunk/txdav/caldav/datastore/test/calendar_store/ho/me/home1/calendar_1/1.ics
CalendarServer/trunk/txdav/caldav/datastore/test/common.py
Modified: CalendarServer/trunk/conf/auth/accounts-test.xml
===================================================================
--- CalendarServer/trunk/conf/auth/accounts-test.xml 2011-04-20 20:27:48 UTC (rev 7336)
+++ CalendarServer/trunk/conf/auth/accounts-test.xml 2011-04-20 20:30:00 UTC (rev 7337)
@@ -38,7 +38,7 @@
<user>
<uid>wsanchez</uid>
<guid>wsanchez</guid>
- <email-address>wsanchez at apple.com</email-address>
+ <email-address>wsanchez at example.com</email-address>
<password>test</password>
<name>Wilfredo Sanchez Vega</name>
<first-name>Wilfredo</first-name>
@@ -47,7 +47,7 @@
<user>
<uid>cdaboo</uid>
<guid>cdaboo</guid>
- <email-address>cdaboo at apple.com</email-address>
+ <email-address>cdaboo at example.com</email-address>
<password>test</password>
<name>Cyrus Daboo</name>
<first-name>Cyrus</first-name>
@@ -56,7 +56,7 @@
<user>
<uid>sagen</uid>
<guid>sagen</guid>
- <email-address>sagen at apple.com</email-address>
+ <email-address>sagen at example.com</email-address>
<password>test</password>
<name>Morgen Sagen</name>
<first-name>Morgen</first-name>
@@ -65,7 +65,7 @@
<user>
<uid>dre</uid>
<guid>andre</guid>
- <email-address>dre at apple.com</email-address>
+ <email-address>dre at example.com</email-address>
<password>test</password>
<name>Andre LaBranche</name>
<first-name>Andre</first-name>
@@ -74,12 +74,21 @@
<user>
<uid>glyph</uid>
<guid>glyph</guid>
- <email-address>glyph at apple.com</email-address>
+ <email-address>glyph at example.com</email-address>
<password>test</password>
<name>Glyph Lefkowitz</name>
<first-name>Glyph</first-name>
<last-name>Lefkowitz</last-name>
</user>
+ <user>
+ <uid>i18nuser</uid>
+ <guid>i18nuser</guid>
+ <email-address>i18nuser at example.com</email-address>
+ <password>i18nuser</password>
+ <name>まだ</name>
+ <first-name>ま</first-name>
+ <last-name>だ</last-name>
+ </user>
<user repeat="99">
<uid>user%02d</uid>
<uid>User %02d</uid>
Modified: CalendarServer/trunk/twistedcaldav/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/resource.py 2011-04-20 20:27:48 UTC (rev 7336)
+++ CalendarServer/trunk/twistedcaldav/resource.py 2011-04-20 20:30:00 UTC (rev 7337)
@@ -1164,7 +1164,7 @@
if principal is None:
return (None, None, None)
else:
- return (principal.record.fullName.decode("utf-8"),
+ return (principal.record.fullName,
principal.record.guid,
principal.record.calendarUserAddresses)
Modified: CalendarServer/trunk/twistedcaldav/scheduling/ischedule.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/ischedule.py 2011-04-20 20:27:48 UTC (rev 7336)
+++ CalendarServer/trunk/twistedcaldav/scheduling/ischedule.py 2011-04-20 20:30:00 UTC (rev 7337)
@@ -289,7 +289,7 @@
if principal is None:
return (None, None, None)
else:
- return (principal.record.fullName.decode("utf-8"),
+ return (principal.record.fullName,
principal.record.guid,
principal.record.calendarUserAddresses)
Modified: CalendarServer/trunk/twistedcaldav/upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/upgrade.py 2011-04-20 20:27:48 UTC (rev 7336)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py 2011-04-20 20:30:00 UTC (rev 7337)
@@ -114,7 +114,7 @@
if principal is None:
return (None, None, None)
else:
- return (principal.record.fullName.decode("utf-8"),
+ return (principal.record.fullName,
principal.record.guid,
principal.record.calendarUserAddresses)
Modified: CalendarServer/trunk/txdav/caldav/datastore/test/calendar_store/ho/me/home1/calendar_1/1.ics
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/calendar_store/ho/me/home1/calendar_1/1.ics 2011-04-20 20:27:48 UTC (rev 7336)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/calendar_store/ho/me/home1/calendar_1/1.ics 2011-04-20 20:30:00 UTC (rev 7337)
@@ -21,12 +21,12 @@
END:VTIMEZONE
BEGIN:VEVENT
ATTENDEE;CN="Wilfredo Sanchez";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailt
- o:wsanchez at apple.com
+ o:wsanchez at example.com
ATTENDEE;CN="Cyrus Daboo";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:cda
- boo at apple.com
+ boo at example.com
DTEND;TZID=US/Pacific:20090324T124500
TRANSP:OPAQUE
-ORGANIZER;CN="Wilfredo Sanchez":mailto:wsanchez at apple.com
+ORGANIZER;CN="Wilfredo Sanchez":mailto:wsanchez at example.com
UID:uid1
DTSTAMP:20090326T145447Z
LOCATION:Wilfredo's Office
Modified: CalendarServer/trunk/txdav/caldav/datastore/test/common.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/common.py 2011-04-20 20:27:48 UTC (rev 7336)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/common.py 2011-04-20 20:30:00 UTC (rev 7337)
@@ -944,7 +944,7 @@
"""
self.assertEquals(
(yield self.calendarObjectUnderTest()).organizer(),
- "mailto:wsanchez at apple.com"
+ "mailto:wsanchez at example.com"
)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110420/72c3cf97/attachment.html>
More information about the calendarserver-changes
mailing list