Merge branch '2.13' of https://github.com/zopefoundation/Zope into 2.13

doc/CHANGES.rst

@@ -8,6 +8,9 @@ http://docs.zope.org/zope2/
 2.13.23 (unreleased)
 --------------------
 
+- LP #1465432:  Ensure that WSGIPublisher starts / ends interaction at
+  request boundaries (analogous to ZPublisher).  Backport from master.
+
 - Fix: Queue additional warning filters at the beginning of the queue in order
   to allow overrides.
 
@@ -20,6 +23,19 @@ http://docs.zope.org/zope2/
 
 - LP #1386795: Fix ``zopectl start`` with zdaemon 3 and newer.
 
+- Updated distributions:
+
+  - Acquisition = 2.13.9
+  - DateTime = 2.12.8
+  - Products.BTreeFolder2 = 2.13.5
+  - Products.ExternalMethod = 2.13.1
+  - Products.Mailhost = 2.13.2
+  - Products.StandardCacheManagers = 2.13.1
+  - ZConfig = 2.9.3
+  - zLOG = 2.11.2
+  - zope.dublincore = 3.7.1
+  - zope.mkzeoinstance = 3.9.6
+
 2.13.22 (2014-02-19)
 --------------------
 
@@ -31,8 +47,8 @@ http://docs.zope.org/zope2/
 
 - Updated distributions:
 
-    - Products.ZCatalog = 2.13.27
-    - Products.ZCTextIndex = 2.13.5
+  - Products.ZCatalog = 2.13.27
+  - Products.ZCTextIndex = 2.13.5
 
 2.13.21 (2013-07-16)
 --------------------
@@ -169,6 +185,11 @@ http://docs.zope.org/zope2/
   Ported the ``shiftNameToApplication`` implementation from zope.publisher to
   ZPublisher.HTTPRequest.HTTPRequest.
 
+- Ensure that the ``WSGIPublisher`` begins and ends an *interaction*
+  at the request/response barrier. This is required for instance for
+  the ``checkPermission`` call to function without an explicit
+  ``interaction`` parameter.
+
 - Ensure that ObjectManager's ``get`` and ``__getitem__`` methods return only
   "items" (no attributes / methods from the class or from acquisition).
   Thanks to Richard Mitchell at Netsight for the report.

sources.cfg

@@ -6,44 +6,24 @@ github_push = git@github.com:zopefoundation
 AccessControl = git ${remotes:github}/AccessControl pushurl=${remotes:github_push}/AccessControl branch=2.13
 Acquisition = git ${remotes:github}/Acquisition pushurl=${remotes:github_push}/Acquisition branch=2.13
 DateTime = git ${remotes:github}/DateTime pushurl=${remotes:github_push}/DateTime branch=2.12
-# Note:  this should be using a not-yet-ready-for-prime-time 2.13 branch
-DocumentTemplate = git ${remotes:github}/DocumentTemplate pushurl=${remotes:github_push}/DocumentTemplate
-# Note:  this should be using a not-yet-existing 2.13 branch
-ExtensionClass = git ${remotes:github}/ExtensionClass pushurl=${remotes:github_push}/ExtensionClass
-# 'master' branch is still on 2.13 release line.
+DocumentTemplate = git ${remotes:github}/DocumentTemplate pushurl=${remotes:github_push}/DocumentTemplate branch=2.13
+ExtensionClass = git ${remotes:github}/ExtensionClass pushurl=${remotes:github_push}/ExtensionClass branch=2.13
 initgroups = git ${remotes:github}/initgroups pushurl=${remotes:github_push}/initgroups
-# Note:  this should be using a not-yet-existing 2.13 branch
-Missing = git ${remotes:github}/Missing pushurl=${remotes:github_push}/Missing
-# Note:  this should be using a not-yet-existing 2.13 branch
-MultiMapping = git ${remotes:github}/MultiMapping pushurl=${remotes:github_push}/MultiMapping
-nt_svcutils = git ${remotes:github}/nt_svcutils pushurl=${remotes:github_push}/nt_svcutils
-# Note:  this should be using a not-yet-existing 2.13 branch
-Persistence = git ${remotes:github}/Persistence pushurl=${remotes:github_push}/Persistence
-# 'master' branch is still on 2.13 release line.
-Products.BTreeFolder2 = git ${remotes:github}/Products.BTreeFolder2 pushurl=${remotes:github_push}/Products.BTreeFolder2
-# 'master' branch is still on 2.13 release line.
-Products.ExternalMethod = git ${remotes:github}/Products.ExternalMethod pushurl=${remotes:github_push}/Products.ExternalMethod
-# 'master' branch is still on 2.13 release line.
-Products.MailHost = git ${remotes:github}/Products.MailHost pushurl=${remotes:github_push}/Products.MailHost
-# 'master' branch is still on 2.13 release line.
-Products.MIMETools = git ${remotes:github}/Products.MIMETools pushurl=${remotes:github_push}/Products.MIMETools
-# 'master' branch is still on 2.13 release line.
-Products.OFSP = git ${remotes:github}/Products.OFSP pushurl=${remotes:github_push}/Products.OFSP
-# 'master' branch is still on 2.13 release line.
-Products.PythonScripts = git ${remotes:github}/Products.PythonScripts pushurl=${remotes:github_push}/Products.PythonScripts
-# 'master' branch is still on 2.13 release line.
-Products.StandardCacheManagers = git ${remotes:github}/Products.StandardCacheManagers pushurl=${remotes:github_push}/Products.StandardCacheManagers
-# 'master' branch is still on 2.13 release line.
+Missing = git ${remotes:github}/Missing pushurl=${remotes:github_push}/Missing branch=2.13
+MultiMapping = git ${remotes:github}/MultiMapping pushurl=${remotes:github_push}/MultiMapping branch=2.13
+nt_svcutils = git ${remotes:github}/nt_svcutils pushurl=${remotes:github_push}/nt_svcutils branch=2.13
+Persistence = git ${remotes:github}/Persistence pushurl=${remotes:github_push}/Persistence branch=2.13
+Products.BTreeFolder2 = git ${remotes:github}/Products.BTreeFolder2 pushurl=${remotes:github_push}/Products.BTreeFolder2 branch=2.13
+Products.ExternalMethod = git ${remotes:github}/Products.ExternalMethod pushurl=${remotes:github_push}/Products.ExternalMethod branch=2.13
+Products.MailHost = git ${remotes:github}/Products.MailHost pushurl=${remotes:github_push}/Products.MailHost branch=2.13
+Products.MIMETools = git ${remotes:github}/Products.MIMETools pushurl=${remotes:github_push}/Products.MIMETools branch=2.13
+Products.OFSP = git ${remotes:github}/Products.OFSP pushurl=${remotes:github_push}/Products.OFSP branch=2.13
+Products.PythonScripts = git ${remotes:github}/Products.PythonScripts pushurl=${remotes:github_push}/Products.PythonScripts branch=2.13
+Products.StandardCacheManagers = git ${remotes:github}/Products.StandardCacheManagers pushurl=${remotes:github_push}/Products.StandardCacheManagers branch=2.13
 Products.ZCatalog = git ${remotes:github}/Products.ZCatalog pushurl=${remotes:github_push}/Products.ZCatalog branch=2.13
-# 'master' branch is still on 2.13 release line.
-Products.ZCTextIndex = git ${remotes:github}/Products.ZCTextIndex pushurl=${remotes:github_push}/Products.ZCTextIndex
-# Note:  this should be using a not-yet-existing 2.13 branch
-Record = git ${remotes:github}/Record pushurl=${remotes:github_push}/Record
-# Note:  this should be using a not-yet-existing 2.12 branch
-tempstorage = git ${remotes:github}/tempstorage pushurl=${remotes:github_push}/tempstorage
-# Note:  this should be using a not-yet-existing 2.13 branch
-zExceptions = git ${remotes:github}/zExceptions pushurl=${remotes:github_push}/zExceptions
-# 'master' branch is still on 2.12 release line.
+Products.ZCTextIndex = git ${remotes:github}/Products.ZCTextIndex pushurl=${remotes:github_push}/Products.ZCTextIndex branch=2.13
+Record = git ${remotes:github}/Record pushurl=${remotes:github_push}/Record branch=2.13
+tempstorage = git ${remotes:github}/tempstorage pushurl=${remotes:github_push}/tempstorage branch=2.12
+zExceptions = git ${remotes:github}/zExceptions pushurl=${remotes:github_push}/zExceptions branch=2.13
 zLOG = git ${remotes:github}/zLOG pushurl=${remotes:github_push}/zLOG branch=2.11
-# Note:  this should be using a not-yet-existing 2.12 branch
-ZopeUndo = git ${remotes:github}/ZopeUndo pushurl=${remotes:github_push}/ZopeUndo
+ZopeUndo = git ${remotes:github}/ZopeUndo pushurl=${remotes:github_push}/ZopeUndo branch=2.12

src/ZPublisher/WSGIPublisher.py

@@ -19,6 +19,7 @@ import transaction
 from zExceptions import Redirect
 from zExceptions import Unauthorized
 from zope.event import notify
+from zope.security.management import newInteraction, endInteraction
 from zope.publisher.skinnable import setDefaultSkin
 from ZServer.medusa.http_date import build_http_date
 
@@ -169,45 +170,49 @@ def publish(request, module_name,
     ) = _get_module_info(module_name)
 
     notify(PubStart(request))
-    request.processInputs()
-    response = request.response
-
-    if bobo_after is not None:
-        response.after_list += (bobo_after,)
-
-    if debug_mode:
-        response.debug_mode = debug_mode
-
-    if realm and not request.get('REMOTE_USER', None):
-        response.realm = realm
-
-    if bobo_before is not None:
-        bobo_before()
-
-    # Get the path list.
-    # According to RFC1738 a trailing space in the path is valid.
-    path = request.get('PATH_INFO')
-
-    request['PARENTS'] = [object]
-    object = request.traverse(path, validated_hook=validated_hook)
-    notify(PubAfterTraversal(request))
-
-    if transactions_manager:
-        transactions_manager.recordMetaData(object, request)
-
-    result = mapply(object,
-                    request.args,
-                    request,
-                    call_object,
-                    1,
-                    missing_name,
-                    dont_publish_class,
-                    request,
-                    bind=1,
-                    )
-
-    if result is not response:
-        response.setBody(result)
+    newInteraction()
+    try:
+        request.processInputs()
+        response = request.response
+
+        if bobo_after is not None:
+            response.after_list += (bobo_after,)
+
+        if debug_mode:
+            response.debug_mode = debug_mode
+
+        if realm and not request.get('REMOTE_USER', None):
+            response.realm = realm
+
+        if bobo_before is not None:
+            bobo_before()
+
+        # Get the path list.
+        # According to RFC1738 a trailing space in the path is valid.
+        path = request.get('PATH_INFO')
+
+        request['PARENTS'] = [object]
+        object = request.traverse(path, validated_hook=validated_hook)
+        notify(PubAfterTraversal(request))
+
+        if transactions_manager:
+            transactions_manager.recordMetaData(object, request)
+
+        result = mapply(object,
+                        request.args,
+                        request,
+                        call_object,
+                        1,
+                        missing_name,
+                        dont_publish_class,
+                        request,
+                        bind=1,
+                        )
+
+        if result is not response:
+            response.setBody(result)
+    finally:
+        endInteraction()
 
     notify(PubBeforeCommit(request))
     return response

versions.cfg

@@ -7,7 +7,7 @@ versions = versions
 Zope2 =
 AccessControl = 2.13.13
 Acquisition = 2.13.9
-DateTime = 2.12.7
+DateTime = 2.12.8
 DocumentTemplate = 2.13.2
 ExtensionClass = 2.13.2
 initgroups = 2.13.0
@@ -15,7 +15,7 @@ Missing = 2.13.1
 MultiMapping = 2.13.0
 nt-svcutils = 2.13.0
 Persistence = 2.13.2
-Products.BTreeFolder2 = 2.13.4
+Products.BTreeFolder2 = 2.13.5
 Products.ExternalMethod = 2.13.1
 Products.MailHost = 2.13.2
 Products.MIMETools = 2.13.0
@@ -27,7 +27,7 @@ Products.ZCTextIndex = 2.13.5
 Record = 2.13.0
 tempstorage = 2.12.2
 zExceptions = 2.13.0
-zLOG = 2.11.1
+zLOG = 2.11.2
 ZopeUndo = 2.12.0
 
 # ZTK KGS overrides