[CalendarServer-changes] [7351] CalendarServer/branches/users/glyph/oracle-nulls/twext/enterprise/ dal/syntax.py

[source_changes at macosforge.org]

Revision: 7351
          http://trac.macosforge.org/projects/calendarserver/changeset/7351
Author:   glyph at apple.com
Date:     2011-04-21 09:53:34 -0700 (Thu, 21 Apr 2011)
Log Message:
-----------
minor tweaks based on cdt

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/oracle-nulls/twext/enterprise/dal/syntax.py

Modified: CalendarServer/branches/users/glyph/oracle-nulls/twext/enterprise/dal/syntax.py
===================================================================
--- CalendarServer/branches/users/glyph/oracle-nulls/twext/enterprise/dal/syntax.py	2011-04-21 16:53:28 UTC (rev 7350)
+++ CalendarServer/branches/users/glyph/oracle-nulls/twext/enterprise/dal/syntax.py	2011-04-21 16:53:34 UTC (rev 7351)
@@ -214,6 +214,8 @@
         columns we expect to have returned, and replacing any C{None}s with
         empty strings in the appropriate position.
         """
+        if rows is None:
+            return None
         newRows = []
         for row in rows:
             newRow = []
@@ -934,7 +936,7 @@
 
 
     def _resultColumns(self):
-        return self.Return
+        return self._returnAsList()
 
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110421/07b2bc3e/attachment.html>