[CalendarServer-changes] [15316] twext/trunk/twext

[source_changes at macosforge.org]

Revision: 15316
          http://trac.calendarserver.org//changeset/15316
Author:   cdaboo at apple.com
Date:     2015-11-16 09:45:50 -0800 (Mon, 16 Nov 2015)
Log Message:
-----------
Fix some logging and schema comparison issues.

Modified Paths:
--------------
    twext/trunk/twext/enterprise/dal/model.py
    twext/trunk/twext/python/log.py

Modified: twext/trunk/twext/enterprise/dal/model.py
===================================================================
--- twext/trunk/twext/enterprise/dal/model.py	2015-11-16 17:23:53 UTC (rev 15315)
+++ twext/trunk/twext/enterprise/dal/model.py	2015-11-16 17:45:50 UTC (rev 15316)
@@ -709,10 +709,15 @@
 
         results = []
 
-        def _compareLists(list1, list2, descriptor):
-            myItems = dict([(item.name.lower()[:63], item) for item in list1])
+        def lowerTruncateName(name):
+            return name.lower()[:63]
+        def lowerName(name):
+            return name.lower()
+
+        def _compareLists(list1, list2, descriptor, nameNormalize):
+            myItems = dict([(nameNormalize(item.name), item) for item in list1])
             otherItems = dict([
-                (item.name.lower()[:63], item) for item in list2
+                (nameNormalize(item.name), item) for item in list2
             ])
             for item in set(myItems.keys()) - set(otherItems.keys()):
                 results.append(
@@ -728,10 +733,10 @@
             for name in set(myItems.keys()) & set(otherItems.keys()):
                 results.extend(myItems[name].compare(otherItems[name]))
 
-        _compareLists(self.tables, other.tables, "table")
-        _compareLists(self.pseudoIndexes(), other.pseudoIndexes(), "index")
-        _compareLists(self.sequences, other.sequences, "sequence")
-        _compareLists(self.functions, other.functions, "functions")
+        _compareLists(self.tables, other.tables, "table", lowerTruncateName)
+        _compareLists(self.pseudoIndexes(), other.pseudoIndexes(), "index", lowerName)
+        _compareLists(self.sequences, other.sequences, "sequence", lowerTruncateName)
+        _compareLists(self.functions, other.functions, "functions", lowerTruncateName)
 
         return results
 

Modified: twext/trunk/twext/python/log.py
===================================================================
--- twext/trunk/twext/python/log.py	2015-11-16 17:23:53 UTC (rev 15315)
+++ twext/trunk/twext/python/log.py	2015-11-16 17:45:50 UTC (rev 15316)
@@ -58,9 +58,9 @@
 
 
     @classmethod
-    def beginLoggingTo(cls, observers):
+    def beginLoggingTo(cls, observers, redirectStandardIO=True):
         if cls.logBeginner:
-            cls.logBeginner.beginLoggingTo(observers)
+            cls.logBeginner.beginLoggingTo(observers, redirectStandardIO=redirectStandardIO)
 
 
     def emit(self, level, format=None, **kwargs):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20151116/8c6e0ab6/attachment.html>