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

[source_changes at macosforge.org]

Revision: 10646
          http://trac.calendarserver.org//changeset/10646
Author:   wsanchez at apple.com
Date:     2013-02-04 15:19:04 -0800 (Mon, 04 Feb 2013)
Log Message:
-----------
DirectoryRecord.RecordTypeClass -> DirectoryRecord.recordType
DirectoryRecord.FieldNameClass -> DirectoryRecord.fieldName

Modified Paths:
--------------
    CalendarServer/trunk/twext/who/directory.py
    CalendarServer/trunk/twext/who/test/test_directory.py
    CalendarServer/trunk/twext/who/xml.py

Modified: CalendarServer/trunk/twext/who/directory.py
===================================================================
--- CalendarServer/trunk/twext/who/directory.py	2013-02-04 23:15:40 UTC (rev 10645)
+++ CalendarServer/trunk/twext/who/directory.py	2013-02-04 23:19:04 UTC (rev 10646)
@@ -82,8 +82,8 @@
         "realmName",
     )
 
-    RecordTypeClass = MergedConstants(RecordType)
-    FieldNameClass  = MergedConstants(FieldName)
+    recordType = MergedConstants(RecordType)
+    fieldName  = MergedConstants(FieldName)
 
 
     def __init__(self, realmName):
@@ -98,7 +98,7 @@
 
 
     def recordTypes(self):
-        return succeed(self.RecordTypeClass.iterconstants())
+        return succeed(self.recordType.iterconstants())
 
 
     def recordsFromExpression(self, expression):
@@ -183,9 +183,9 @@
                     if not value:
                         raise ValueError("%s field must not be empty." % (fieldName,))
 
-        if fields[FieldName.recordType] not in service.RecordTypeClass.iterconstants():
+        if fields[FieldName.recordType] not in service.recordType.iterconstants():
             raise ValueError("Record type must be one of %r, not %r." % (
-                tuple(service.RecordTypeClass.iterconstants()),
+                tuple(service.recordType.iterconstants()),
                 fields[FieldName.recordType]
             ))
 
@@ -214,7 +214,7 @@
 
     def __getattr__(self, name):
         try:
-            fieldName = self.service.FieldNameClass.lookupByName(name)
+            fieldName = self.service.fieldName.lookupByName(name)
         except ValueError:
             raise AttributeError(name)
 

Modified: CalendarServer/trunk/twext/who/test/test_directory.py
===================================================================
--- CalendarServer/trunk/twext/who/test/test_directory.py	2013-02-04 23:15:40 UTC (rev 10645)
+++ CalendarServer/trunk/twext/who/test/test_directory.py	2013-02-04 23:19:04 UTC (rev 10646)
@@ -61,7 +61,7 @@
         service = self._testService()
         self.assertEquals(
             set((yield service.recordTypes())),
-            set(service.RecordTypeClass.iterconstants())
+            set(service.recordType.iterconstants())
         )
 
 

Modified: CalendarServer/trunk/twext/who/xml.py
===================================================================
--- CalendarServer/trunk/twext/who/xml.py	2013-02-04 23:15:40 UTC (rev 10645)
+++ CalendarServer/trunk/twext/who/xml.py	2013-02-04 23:19:04 UTC (rev 10646)
@@ -120,7 +120,7 @@
     XML directory service.
     """
 
-    FieldNameClass = MergedConstants(BaseFieldName, FieldName)
+    fieldName = MergedConstants(BaseFieldName, FieldName)
 
     ElementClass   = Element
     AttributeClass = Attribute
@@ -229,10 +229,10 @@
                     unknownRecordTypes.add(recordTypeAttribute)
                     continue
             else:
-                recordType = self.RecordTypeClass.user
+                recordType = self.recordType.user
 
             fields = {}
-            fields[self.FieldNameClass.recordType] = recordType
+            fields[self.fieldName.recordType] = recordType
 
             for fieldNode in recordNode.getchildren():
                 try:
@@ -249,7 +249,7 @@
 
                 value = fieldNode.text.encode("utf-8")
 
-                if self.FieldNameClass.isMultiValue(fieldName):
+                if self.fieldName.isMultiValue(fieldName):
                     values = fields.setdefault(fieldName, [])
                     values.append(value)
                 else:
@@ -272,7 +272,7 @@
                 values = record.fields.get(fieldName, None)
 
                 if values is not None:
-                    if not self.FieldNameClass.isMultiValue(fieldName):
+                    if not self.fieldName.isMultiValue(fieldName):
                         values = (values,)
 
                     for value in values:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130204/67e99e09/attachment.html>