[CalendarServer-changes] [14910] CalendarServer/branches/users/cdaboo/cfod
source_changes at macosforge.org
source_changes at macosforge.org
Wed Jun 24 07:39:35 PDT 2015
Revision: 14910
http://trac.calendarserver.org//changeset/14910
Author: cdaboo at apple.com
Date: 2015-06-24 07:39:34 -0700 (Wed, 24 Jun 2015)
Log Message:
-----------
More PyPy fixes.
Modified Paths:
--------------
CalendarServer/branches/users/cdaboo/cfod/requirements-stable.txt
CalendarServer/branches/users/cdaboo/cfod/txdav/base/datastore/file.py
CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/index_file.py
CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/scheduling/imip/mailgateway.py
CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/scheduling/imip/test/test_mailgateway.py
CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/test/test_index_file.py
CalendarServer/branches/users/cdaboo/cfod/txdav/carddav/datastore/index_file.py
CalendarServer/branches/users/cdaboo/cfod/txdav/carddav/datastore/test/test_index_file.py
Modified: CalendarServer/branches/users/cdaboo/cfod/requirements-stable.txt
===================================================================
--- CalendarServer/branches/users/cdaboo/cfod/requirements-stable.txt 2015-06-24 14:38:10 UTC (rev 14909)
+++ CalendarServer/branches/users/cdaboo/cfod/requirements-stable.txt 2015-06-24 14:39:34 UTC (rev 14910)
@@ -36,7 +36,7 @@
#pyOpenSSL
pycrypto==2.6.1
- --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/branches/users/cdaboo/cfod@14899#egg=twextpy
+ --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/branches/users/cdaboo/cfod@14909#egg=twextpy
cffi==1.1.0
pycparser==2.13
#twisted
Modified: CalendarServer/branches/users/cdaboo/cfod/txdav/base/datastore/file.py
===================================================================
--- CalendarServer/branches/users/cdaboo/cfod/txdav/base/datastore/file.py 2015-06-24 14:38:10 UTC (rev 14909)
+++ CalendarServer/branches/users/cdaboo/cfod/txdav/base/datastore/file.py 2015-06-24 14:39:34 UTC (rev 14910)
@@ -249,7 +249,8 @@
# present. However, our unit tests use static files for their data store and those currently
# do not include the md5 xattr.
try:
- data = self._path.open().read()
+ with self._path.open() as f:
+ data = f.read()
except IOError:
return None
md5 = hashlib.md5(data).hexdigest()
Modified: CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/index_file.py
===================================================================
--- CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/index_file.py 2015-06-24 14:38:10 UTC (rev 14909)
+++ CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/index_file.py 2015-06-24 14:39:34 UTC (rev 14910)
@@ -1103,8 +1103,11 @@
if name.startswith("."):
continue
+ child = fp.child(name)
+ if not child.isfile():
+ continue
try:
- stream = fp.child(name).open()
+ stream = child.open()
except (IOError, OSError), e:
log.error("Unable to open resource %s: %s" % (name, e))
continue
@@ -1215,8 +1218,11 @@
if name.startswith("."):
continue
+ child = fp.child(name)
+ if not child.isfile():
+ continue
try:
- stream = fp.child(name).open()
+ stream = child.open()
except (IOError, OSError), e:
log.error("Unable to open resource %s: %s" % (name, e))
continue
Modified: CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/scheduling/imip/mailgateway.py
===================================================================
--- CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/scheduling/imip/mailgateway.py 2015-06-24 14:38:10 UTC (rev 14909)
+++ CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/scheduling/imip/mailgateway.py 2015-06-24 14:39:34 UTC (rev 14910)
@@ -235,6 +235,7 @@
yield txn.imipCreateToken(organizer, attendee, icaluid, token=token)
yield txn.commit()
+ oldDB._db_close()
os.remove(oldDB.dbpath)
journalPath = oldDB.dbpath + "-journal"
if os.path.exists(journalPath):
Modified: CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/scheduling/imip/test/test_mailgateway.py
===================================================================
--- CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/scheduling/imip/test/test_mailgateway.py 2015-06-24 14:38:10 UTC (rev 14909)
+++ CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/scheduling/imip/test/test_mailgateway.py 2015-06-24 14:39:34 UTC (rev 14910)
@@ -49,3 +49,4 @@
self.assertEquals(records[0].organizer, "urn:uuid:user01")
self.assertEquals(records[0].attendee, "mailto:attendee at example.com")
self.assertEquals(records[0].icaluid, "icaluid1")
+ oldDB._db_close()
Modified: CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/test/test_index_file.py
===================================================================
--- CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/test/test_index_file.py 2015-06-24 14:38:10 UTC (rev 14909)
+++ CalendarServer/branches/users/cdaboo/cfod/txdav/caldav/datastore/test/test_index_file.py 2015-06-24 14:39:34 UTC (rev 14910)
@@ -45,7 +45,8 @@
def iCalendar(self):
- text = self.fp.open().read()
+ with self.fp.open() as f:
+ text = f.read()
try:
component = Component.fromString(text)
# Fix any bogus data we can
@@ -1167,6 +1168,7 @@
def tearDown(self):
+ super(MemcacheTests, self).tearDown()
for _ignore_k, v in self.memcache._timeouts.iteritems():
if v.active():
v.cancel()
Modified: CalendarServer/branches/users/cdaboo/cfod/txdav/carddav/datastore/index_file.py
===================================================================
--- CalendarServer/branches/users/cdaboo/cfod/txdav/carddav/datastore/index_file.py 2015-06-24 14:38:10 UTC (rev 14909)
+++ CalendarServer/branches/users/cdaboo/cfod/txdav/carddav/datastore/index_file.py 2015-06-24 14:39:34 UTC (rev 14910)
@@ -635,8 +635,11 @@
if name.startswith("."):
continue
+ child = fp.child(name)
+ if not child.isfile():
+ continue
try:
- stream = fp.child(name).open()
+ stream = child.open()
except (IOError, OSError), e:
log.error("Unable to open resource %s: %s" % (name, e))
continue
Modified: CalendarServer/branches/users/cdaboo/cfod/txdav/carddav/datastore/test/test_index_file.py
===================================================================
--- CalendarServer/branches/users/cdaboo/cfod/txdav/carddav/datastore/test/test_index_file.py 2015-06-24 14:38:10 UTC (rev 14909)
+++ CalendarServer/branches/users/cdaboo/cfod/txdav/carddav/datastore/test/test_index_file.py 2015-06-24 14:39:34 UTC (rev 14910)
@@ -214,6 +214,7 @@
def tearDown(self):
+ super(MemcacheTests, self).tearDown()
for _ignore_k, v in self.memcache._timeouts.iteritems():
if v.active():
v.cancel()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150624/4dbdec31/attachment-0001.html>
More information about the calendarserver-changes
mailing list