[CalendarServer-changes] [10557] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 10557
          http://trac.calendarserver.org//changeset/10557
Author:   wsanchez at apple.com
Date:     2013-01-28 12:40:09 -0800 (Mon, 28 Jan 2013)
Log Message:
-----------
Require Twisted 12.2.  Download 12.3.0.

Modified Paths:
--------------
    CalendarServer/trunk/support/build.sh
    CalendarServer/trunk/twext/who/idirectory.py

Added Paths:
-----------
    CalendarServer/trunk/twext/who/test/
    CalendarServer/trunk/twext/who/test/__init__.py

Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh	2013-01-27 17:59:48 UTC (rev 10556)
+++ CalendarServer/trunk/support/build.sh	2013-01-28 20:40:09 UTC (rev 10557)
@@ -753,9 +753,9 @@
 
   # Maintenance note: next time the Twisted dependency gets updated, check out
   # twext/patches.py.
-  py_dependency -v 12 -m "cf49a8676c21c50faf1b42b528049471" \
-    "Twisted" "twisted" "Twisted-12.0.0" \
-    "${pypi}/T/Twisted/Twisted-12.0.0.tar.bz2";
+  py_dependency -v 12.2 -m "6e289825f3bf5591cfd670874cc0862d" \
+    "Twisted" "twisted" "Twisted-12.3.0" \
+    "${pypi}/T/Twisted/Twisted-12.3.0.tar.bz2";
 
   local du="python-dateutil-1.5";
   py_dependency -m "35f3732db3f2cc4afdc68a8533b60a52" \

Modified: CalendarServer/trunk/twext/who/idirectory.py
===================================================================
--- CalendarServer/trunk/twext/who/idirectory.py	2013-01-27 17:59:48 UTC (rev 10556)
+++ CalendarServer/trunk/twext/who/idirectory.py	2013-01-28 20:40:09 UTC (rev 10557)
@@ -20,8 +20,10 @@
 
 __all__ = [
     "DirectoryServiceError",
+    "QueryNotSupportedError",
     "FieldName",
     "MatchType",
+    "Operand",
     "QueryFlags",
     "IDirectoryQueryMatchExpression",
     "IDirectoryService",
@@ -93,7 +95,7 @@
     """
     Directory query.
     """
-    fieldName  = Attribute("A L{Field}.")
+    fieldName  = Attribute("A L{FieldName}.")
     fieldValue = Attribute("A text value to match.")
     matchType  = Attribute("A L{MatchType}.")
     flags      = Attribute("L{QueryFlags}.")
@@ -127,4 +129,4 @@
     Directory record.
     """
     service = Attribute("The L{IDirectoryService} this record exists in.")
-    fields  = Attribute("...") # FIXME
+    fields  = Attribute("A dictionary with L{FieldName} keys and text values.")

Copied: CalendarServer/trunk/twext/who/test/__init__.py (from rev 10556, CalendarServer/trunk/twext/who/__init__.py)
===================================================================
--- CalendarServer/trunk/twext/who/test/__init__.py	                        (rev 0)
+++ CalendarServer/trunk/twext/who/test/__init__.py	2013-01-28 20:40:09 UTC (rev 10557)
@@ -0,0 +1,19 @@
+##
+# Copyright (c) 2013 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+"""
+Directory service integration tests
+"""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130128/f9fc0352/attachment.html>