[CalendarServer-changes] [15279] twext/trunk

[source_changes at macosforge.org]

Revision: 15279
          http://trac.calendarserver.org//changeset/15279
Author:   cdaboo at apple.com
Date:     2015-11-04 06:34:33 -0800 (Wed, 04 Nov 2015)
Log Message:
-----------
Package updates and fixes.

Modified Paths:
--------------
    twext/trunk/setup.py
    twext/trunk/twext/enterprise/test/test_adbapi2.py
    twext/trunk/twext/internet/threadutils.py

Modified: twext/trunk/setup.py
===================================================================
--- twext/trunk/setup.py	2015-11-03 02:30:31 UTC (rev 15278)
+++ twext/trunk/setup.py	2015-11-04 14:34:33 UTC (rev 15279)
@@ -239,13 +239,13 @@
 setup_requirements = []
 
 install_requirements = [
-    "cffi>=0.6",
-    "twisted>=15.2.0",
+    "cffi",
+    "twisted>=15.4.0",
 ]
 
 extras_requirements = {
     # Database Abstraction Layer
-    "DAL": ["sqlparse>=0.1.11"],
+    "DAL": ["sqlparse"],
 
     # LDAP
     "LDAP": ["python-ldap"],

Modified: twext/trunk/twext/enterprise/test/test_adbapi2.py
===================================================================
--- twext/trunk/twext/enterprise/test/test_adbapi2.py	2015-11-03 02:30:31 UTC (rev 15278)
+++ twext/trunk/twext/enterprise/test/test_adbapi2.py	2015-11-04 14:34:33 UTC (rev 15279)
@@ -662,12 +662,16 @@
 
         # Remove the holders for the existing connections, so that the "extra"
         # connection() call wins the race and gets executed first.
+        oldholders = list(self.holders)
         self.holders[:] = []
         self.createTransaction()
         self.flushHolders()
         self.assertEquals(len(self.factory.connections), 2)
 
+        self.holders = oldholders
+        self.flushHolders()
 
+
     def setParamstyle(self, paramstyle):
         """
         Change the paramstyle of the transaction under test.

Modified: twext/trunk/twext/internet/threadutils.py
===================================================================
--- twext/trunk/twext/internet/threadutils.py	2015-11-03 02:30:31 UTC (rev 15278)
+++ twext/trunk/twext/internet/threadutils.py	2015-11-04 14:34:33 UTC (rev 15279)
@@ -115,7 +115,7 @@
     def retry(self):
         if self._state == _STATE_STARTING:
             if self._retryCallback is not None:
-                self._reactor.threadpool._startSomeWorkers()
+                self._reactor.threadpool.adjustPoolsize()
             self._retryCallback = self._reactor.callLater(0.1, self.retry)
         else:
             self._retryCallback = None
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20151104/80a28ae8/attachment.html>