[CalendarServer-changes] [14902] CalendarServer/branches/users/cdaboo/cfod/txdav/carddav/datastore/ sql.py

source_changes at macosforge.org source_changes at macosforge.org
Fri Jun 19 12:17:40 PDT 2015


Revision: 14902
          http://trac.calendarserver.org//changeset/14902
Author:   cdaboo at apple.com
Date:     2015-06-19 12:17:40 -0700 (Fri, 19 Jun 2015)
Log Message:
-----------
Fix because PyPy does not like non-str keywords, but cPython was optimizing away the keywords so it was not a problem before.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/cfod/txdav/carddav/datastore/sql.py

Modified: CalendarServer/branches/users/cdaboo/cfod/txdav/carddav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/cdaboo/cfod/txdav/carddav/datastore/sql.py	2015-06-19 18:06:12 UTC (rev 14901)
+++ CalendarServer/branches/users/cdaboo/cfod/txdav/carddav/datastore/sql.py	2015-06-19 19:17:40 UTC (rev 14902)
@@ -766,7 +766,8 @@
                     missingNameIDs
                 ).on(self._txn, resourceIDs=missingNameIDs)
             )
-            idToNameMap = dict(dict(idToNameMap), **dict(memberIDNameRows))
+            idToNameMap = dict(idToNameMap)
+            idToNameMap.update(dict(memberIDNameRows))
 
         # now do revisions
         if revision:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150619/a5a7c573/attachment.html>


More information about the calendarserver-changes mailing list