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

source_changes at macosforge.org source_changes at macosforge.org
Thu Jul 3 11:22:35 PDT 2014


Revision: 13717
          http://trac.calendarserver.org//changeset/13717
Author:   cdaboo at apple.com
Date:     2014-07-03 11:22:35 -0700 (Thu, 03 Jul 2014)
Log Message:
-----------
Missing yields.

Modified Paths:
--------------
    twext/trunk/twext/enterprise/dal/syntax.py
    twext/trunk/twext/who/checker.py

Modified: twext/trunk/twext/enterprise/dal/syntax.py
===================================================================
--- twext/trunk/twext/enterprise/dal/syntax.py	2014-07-03 18:21:55 UTC (rev 13716)
+++ twext/trunk/twext/enterprise/dal/syntax.py	2014-07-03 18:22:35 UTC (rev 13717)
@@ -1737,16 +1737,17 @@
         return self._returningClause(queryGenerator, stmt, allTables)
 
 
+    @inlineCallbacks
     def on(self, txn, *a, **kw):
         """
         Override to provide extra logic for L{Insert}s that return values on
         databases that don't provide return values as part of their C{INSERT}
         behavior.
         """
-        result = super(_DMLStatement, self).on(txn, *a, **kw)
+        result = yield super(_DMLStatement, self).on(txn, *a, **kw)
         if self.Return is not None and txn.dialect == SQLITE_DIALECT:
             table = self._returnAsList()[0].model.table
-            return Select(
+            result = yield Select(
                 self._returnAsList(),
                 # TODO: error reporting when "return" includes columns
                 # foreign to the primary table.
@@ -1757,7 +1758,7 @@
                     ) == _sqliteLastInsertRowID()
                 )
             ).on(txn, *a, **kw)
-        return result
+        returnValue(result)
 
 
 

Modified: twext/trunk/twext/who/checker.py
===================================================================
--- twext/trunk/twext/who/checker.py	2014-07-03 18:21:55 UTC (rev 13716)
+++ twext/trunk/twext/who/checker.py	2014-07-03 18:22:35 UTC (rev 13717)
@@ -121,7 +121,7 @@
                 "Not an IHTTPDigestVerifier: {0!r}".format(record)
             )
 
-        if record.verifyHTTPDigest(
+        result = yield record.verifyHTTPDigest(
             credentials.username,
             credentials.fields.get("realm"),
             credentials.fields.get("uri"),
@@ -132,7 +132,8 @@
             credentials.fields.get("qop", "auth"),
             credentials.fields.get("response"),
             credentials.method,
-        ):
+        )
+        if result:
             returnValue(record)
 
         raise UnauthorizedLogin("Incorrect password")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140703/62d1e64f/attachment.html>


More information about the calendarserver-changes mailing list