[Checkins] SVN: zope.publisher/branches/3.5/ backport of removing staggering behavior in supportsRetry

[Gary Poster]

Log message for revision 103041:
  backport of removing staggering behavior in supportsRetry

Changed:
  U   zope.publisher/branches/3.5/CHANGES.txt
  U   zope.publisher/branches/3.5/buildout.cfg
  U   zope.publisher/branches/3.5/setup.py
  U   zope.publisher/branches/3.5/src/zope/publisher/http.py

-=-
Modified: zope.publisher/branches/3.5/CHANGES.txt
===================================================================
--- zope.publisher/branches/3.5/CHANGES.txt	2009-08-21 13:48:09 UTC (rev 103040)
+++ zope.publisher/branches/3.5/CHANGES.txt	2009-08-21 13:50:28 UTC (rev 103041)
@@ -1,12 +1,15 @@
 CHANGES
 =======
 
-3.5.8 (unreleased)
+3.5.8 (2009-08-21)
 ------------------
 
-- ...
+- Removed behavior of doing a time.sleep in the supportsRetry http request
+  (backport from trunk, post-3.8.1).
 
+- Pin buildout more tightly to the 3.4.0 KGS (using versions, not the index).
 
+
 3.5.7 (2009-04-06)
 ------------------
 

Modified: zope.publisher/branches/3.5/buildout.cfg
===================================================================
--- zope.publisher/branches/3.5/buildout.cfg	2009-08-21 13:48:09 UTC (rev 103040)
+++ zope.publisher/branches/3.5/buildout.cfg	2009-08-21 13:50:28 UTC (rev 103041)
@@ -1,8 +1,11 @@
 [buildout]
 develop = .
 parts = test
+extends = http://download.zope.org/zope3.4/3.4.0/versions.cfg
+versions = versions
 
-index = http://download.zope.org/zope3.4/3.4.0/index/
+[versions]
+zope.publisher =
 
 [test]
 recipe = zc.recipe.testrunner

Modified: zope.publisher/branches/3.5/setup.py
===================================================================
--- zope.publisher/branches/3.5/setup.py	2009-08-21 13:48:09 UTC (rev 103040)
+++ zope.publisher/branches/3.5/setup.py	2009-08-21 13:50:28 UTC (rev 103041)
@@ -24,7 +24,7 @@
 """
 
 setup(name='zope.publisher',
-      version = '3.5.8dev',
+      version = '3.5.8',
       url='http://pypi.python.org/pypi/zope.publisher',
       license='ZPL 2.1',
       author='Zope Corporation and Contributors',

Modified: zope.publisher/branches/3.5/src/zope/publisher/http.py
===================================================================
--- zope.publisher/branches/3.5/src/zope/publisher/http.py	2009-08-21 13:48:09 UTC (rev 103040)
+++ zope.publisher/branches/3.5/src/zope/publisher/http.py	2009-08-21 13:50:28 UTC (rev 103041)
@@ -234,7 +234,6 @@
 
 
 DEFAULT_PORTS = {'http': '80', 'https': '443'}
-STAGGER_RETRIES = True
 
 class HTTPRequest(BaseRequest):
     """Model HTTP request data.
@@ -434,8 +433,6 @@
         'See IPublisherRequest'
         count = getattr(self, '_retry_count', 0)
         if count < self.retry_max_count:
-            if STAGGER_RETRIES:
-                time.sleep(random.uniform(0, 2**(count)))
             return True
 
     def retry(self):