[CalendarServer-changes] [11928] CalendarServer/trunk/twext/who

[source_changes at macosforge.org]

Revision: 11928
          http://trac.calendarserver.org//changeset/11928
Author:   wsanchez at apple.com
Date:     2013-11-08 17:21:50 -0800 (Fri, 08 Nov 2013)
Log Message:
-----------
Move Operand to expression.py.

Modified Paths:
--------------
    CalendarServer/trunk/twext/who/directory.py
    CalendarServer/trunk/twext/who/expression.py
    CalendarServer/trunk/twext/who/idirectory.py
    CalendarServer/trunk/twext/who/test/test_directory.py
    CalendarServer/trunk/twext/who/test/test_xml.py

Modified: CalendarServer/trunk/twext/who/directory.py
===================================================================
--- CalendarServer/trunk/twext/who/directory.py	2013-11-09 01:15:59 UTC (rev 11927)
+++ CalendarServer/trunk/twext/who/directory.py	2013-11-09 01:21:50 UTC (rev 11928)
@@ -31,9 +31,9 @@
 
 from twext.who.idirectory import QueryNotSupportedError, NotAllowedError
 from twext.who.idirectory import FieldName, RecordType
-from twext.who.idirectory import Operand
 from twext.who.idirectory import IDirectoryService, IDirectoryRecord
-from twext.who.expression import CompoundExpression, MatchExpression
+from twext.who.expression import CompoundExpression, Operand
+from twext.who.expression import MatchExpression
 from twext.who.util import uniqueResult, describe
 
 

Modified: CalendarServer/trunk/twext/who/expression.py
===================================================================
--- CalendarServer/trunk/twext/who/expression.py	2013-11-09 01:15:59 UTC (rev 11927)
+++ CalendarServer/trunk/twext/who/expression.py	2013-11-09 01:21:50 UTC (rev 11928)
@@ -20,6 +20,7 @@
 """
 
 __all__ = [
+    "Operand",
     "CompoundExpression",
 
     "MatchType",
@@ -36,6 +37,18 @@
 # Compound expression
 #
 
+class Operand(Names):
+    """
+    Contants for common operands.
+    """
+    OR  = NamedConstant()
+    AND = NamedConstant()
+
+    OR.description  = u"or"
+    AND.description = u"and"
+
+
+
 class CompoundExpression(object):
     """
     An expression that groups multiple expressions with an operand.

Modified: CalendarServer/trunk/twext/who/idirectory.py
===================================================================
--- CalendarServer/trunk/twext/who/idirectory.py	2013-11-09 01:15:59 UTC (rev 11927)
+++ CalendarServer/trunk/twext/who/idirectory.py	2013-11-09 01:21:50 UTC (rev 11928)
@@ -30,7 +30,6 @@
 
     "RecordType",
     "FieldName",
-    "Operand",
 
     "IDirectoryService",
     "IDirectoryRecord",
@@ -196,18 +195,6 @@
 
 
 
-class Operand(Names):
-    """
-    Contants for common operands.
-    """
-    OR  = NamedConstant()
-    AND = NamedConstant()
-
-    OR.description  = u"or"
-    AND.description = u"and"
-
-
-
 #
 # Interfaces
 #

Modified: CalendarServer/trunk/twext/who/test/test_directory.py
===================================================================
--- CalendarServer/trunk/twext/who/test/test_directory.py	2013-11-09 01:15:59 UTC (rev 11927)
+++ CalendarServer/trunk/twext/who/test/test_directory.py	2013-11-09 01:21:50 UTC (rev 11928)
@@ -32,8 +32,7 @@
 from twext.who.idirectory import QueryNotSupportedError, NotAllowedError
 from twext.who.idirectory import RecordType, FieldName
 from twext.who.idirectory import IDirectoryService, IDirectoryRecord
-from twext.who.idirectory import Operand
-from twext.who.expression import CompoundExpression
+from twext.who.expression import CompoundExpression, Operand
 from twext.who.directory import DirectoryService, DirectoryRecord
 
 

Modified: CalendarServer/trunk/twext/who/test/test_xml.py
===================================================================
--- CalendarServer/trunk/twext/who/test/test_xml.py	2013-11-09 01:15:59 UTC (rev 11927)
+++ CalendarServer/trunk/twext/who/test/test_xml.py	2013-11-09 01:21:50 UTC (rev 11928)
@@ -27,8 +27,7 @@
 from twisted.internet.defer import inlineCallbacks
 
 from twext.who.idirectory import NoSuchRecordError
-from twext.who.idirectory import Operand
-from twext.who.expression import CompoundExpression
+from twext.who.expression import CompoundExpression, Operand
 from twext.who.expression import MatchExpression, MatchType, MatchFlags
 from twext.who.xml import ParseError
 from twext.who.xml import DirectoryService, DirectoryRecord
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/127e8257/attachment.html>