[CalendarServer-changes] [6658] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Mon Nov 29 12:15:56 PST 2010
Revision: 6658
http://trac.macosforge.org/projects/calendarserver/changeset/6658
Author: sagen at apple.com
Date: 2010-11-29 12:15:49 -0800 (Mon, 29 Nov 2010)
Log Message:
-----------
Relocating calendarserver.od to calendarserver.platform.darwin.od
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/platform/darwin/od/test/test_opendirectory.py
CalendarServer/trunk/calendarserver/tools/resources.py
CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py
CalendarServer/trunk/twistedcaldav/directory/test/test_buildquery.py
CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py
CalendarServer/trunk/twistedcaldav/stdconfig.py
Added Paths:
-----------
CalendarServer/trunk/calendarserver/platform/darwin/od/
Removed Paths:
-------------
CalendarServer/trunk/calendarserver/od/
Modified: CalendarServer/trunk/calendarserver/platform/darwin/od/test/test_opendirectory.py
===================================================================
--- CalendarServer/trunk/calendarserver/od/test/test_opendirectory.py 2010-11-29 18:54:37 UTC (rev 6657)
+++ CalendarServer/trunk/calendarserver/platform/darwin/od/test/test_opendirectory.py 2010-11-29 20:15:49 UTC (rev 6658)
@@ -22,7 +22,7 @@
runTests = False
try:
- from calendarserver.od import opendirectory, dsattributes, dsquery, setup_directory
+ from calendarserver.platform.darwin.od import opendirectory, dsattributes, dsquery, setup_directory
directory = opendirectory.odInit("/Search")
@@ -455,7 +455,7 @@
results = list(opendirectory.queryRecordsWithAttribute_list(
directory,
dsattributes.kDS1AttrGeneratedUID,
- "9dc04a70-e6dd-11df-9492-0800200c9a66",
+ "9DC04A70-E6DD-11DF-9492-0800200C9A66",
dsattributes.eDSExact,
False,
dsattributes.kDSStdRecordTypeUsers,
@@ -473,7 +473,7 @@
results = list(opendirectory.queryRecordsWithAttribute_list(
directory,
dsattributes.kDS1AttrGeneratedUID,
- "9dc04a70-e6dd-11df-9492-0800200c9a66",
+ "9DC04A70-E6DD-11DF-9492-0800200C9A66",
dsattributes.eDSExact,
False,
[
@@ -497,7 +497,7 @@
results = list(opendirectory.queryRecordsWithAttribute_list(
directory,
dsattributes.kDS1AttrGeneratedUID,
- "9dc04a74-e6dd-11df-9492-0800200c9a66",
+ "9DC04A74-E6DD-11DF-9492-0800200C9A66",
dsattributes.eDSExact,
False,
dsattributes.kDSStdRecordTypeUsers,
@@ -516,7 +516,7 @@
results = list(opendirectory.queryRecordsWithAttribute_list(
directory,
dsattributes.kDS1AttrGeneratedUID,
- "9dc04a74-e6dd-11df-9492-0800200c9a66",
+ "9DC04A74-E6DD-11DF-9492-0800200C9A66",
dsattributes.eDSExact,
False,
[
@@ -592,7 +592,7 @@
results = list(opendirectory.queryRecordsWithAttribute_list(
directory,
dsattributes.kDS1AttrGeneratedUID,
- "6c6cd280-e6e3-11df-9492-0800200c9a66",
+ "6C6CD280-E6E3-11DF-9492-0800200C9A66",
dsattributes.eDSExact,
False,
dsattributes.kDSStdRecordTypeGroups,
@@ -617,7 +617,7 @@
results = list(opendirectory.queryRecordsWithAttribute_list(
directory,
dsattributes.kDS1AttrGeneratedUID,
- "6c6cd281-e6e3-11df-9492-0800200c9a66",
+ "6C6CD281-E6E3-11DF-9492-0800200C9A66",
dsattributes.eDSExact,
False,
dsattributes.kDSStdRecordTypeGroups,
@@ -643,7 +643,7 @@
results = list(opendirectory.queryRecordsWithAttribute_list(
directory,
dsattributes.kDSNAttrGroupMembers,
- "9dc04a70-e6dd-11df-9492-0800200c9a66",
+ "9DC04A70-E6DD-11DF-9492-0800200C9A66",
dsattributes.eDSExact,
False,
dsattributes.kDSStdRecordTypeGroups,
@@ -659,7 +659,7 @@
results = list(opendirectory.queryRecordsWithAttribute_list(
directory,
dsattributes.kDSNAttrNestedGroups,
- "9dc04a70-e6dd-11df-9492-0800200c9a66",
+ "9DC04A70-E6DD-11DF-9492-0800200C9A66",
dsattributes.eDSExact,
False,
dsattributes.kDSStdRecordTypeGroups,
Modified: CalendarServer/trunk/calendarserver/tools/resources.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/resources.py 2010-11-29 18:54:37 UTC (rev 6657)
+++ CalendarServer/trunk/calendarserver/tools/resources.py 2010-11-29 20:15:49 UTC (rev 6658)
@@ -33,7 +33,7 @@
import os
import sys
-from calendarserver.od import dsattributes
+from calendarserver.platform.darwin.od import dsattributes
__all__ = [ "migrateResources", ]
Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2010-11-29 18:54:37 UTC (rev 6657)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2010-11-29 20:15:49 UTC (rev 6658)
@@ -39,7 +39,7 @@
from twistedcaldav.directory.directory import DirectoryError, UnknownRecordTypeError
from twistedcaldav.directory.principal import cuAddressConverter
-from calendarserver.od import dsattributes, dsquery
+from calendarserver.platform.darwin.od import dsattributes, dsquery
from twisted.python.reflect import namedModule
Modified: CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py 2010-11-29 18:54:37 UTC (rev 6657)
+++ CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py 2010-11-29 20:15:49 UTC (rev 6658)
@@ -59,7 +59,7 @@
from xmlrpclib import datetime
from vobject.vcard import Name, Address
-from calendarserver.od import dsattributes, dsquery
+from calendarserver.platform.darwin.od import dsattributes, dsquery
from twisted.python.reflect import namedModule
class OpenDirectoryBackingService(DirectoryService):
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_buildquery.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_buildquery.py 2010-11-29 18:54:37 UTC (rev 6657)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_buildquery.py 2010-11-29 20:15:49 UTC (rev 6658)
@@ -16,7 +16,7 @@
from twistedcaldav.test.util import TestCase
from twistedcaldav.directory.appleopendirectory import buildQueries, OpenDirectoryService
-from calendarserver.od import dsattributes
+from calendarserver.platform.darwin.od import dsattributes
class BuildQueryTests(TestCase):
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py 2010-11-29 18:54:37 UTC (rev 6657)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py 2010-11-29 20:15:49 UTC (rev 6658)
@@ -25,7 +25,7 @@
from twisted.internet.defer import inlineCallbacks
from twistedcaldav.directory.directory import DirectoryService
from twistedcaldav.directory.appleopendirectory import OpenDirectoryRecord
- from calendarserver.od import dsattributes
+ from calendarserver.platform.darwin.od import dsattributes
# Wonky hack to prevent unclean reactor shutdowns
class DummyReactor(object):
Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2010-11-29 18:54:37 UTC (rev 6657)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2010-11-29 20:15:49 UTC (rev 6658)
@@ -613,9 +613,9 @@
# Specify which opendirectory module to use:
# "opendirectory" is PyOpenDirectory (the old one which uses
# DirectoryService.framework)
- # "calendarserver.od.opendirectory" is the new PyObjC version which uses
+ # "calendarserver.platform.darwin.od.opendirectory" is the new PyObjC version which uses
# OpenDirectory.framework
- "OpenDirectoryModule": "calendarserver.od.opendirectory",
+ "OpenDirectoryModule": "calendarserver.platform.darwin.od.opendirectory",
"Includes": [], # Other plists to parse after this one
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101129/9216111f/attachment-0001.html>
More information about the calendarserver-changes
mailing list