Merge c123753 from 2.12 branch

doc/CHANGES.rst

@@ -8,6 +8,8 @@ http://docs.zope.org/zope2/releases/.
 2.13.11 (unreleased)
 --------------------
 
+- Turn `UndoSupport.get_request_var_or_attr` helper into a private API.
+
 - LP #902068: Fixed missing security declaration for `ObjectManager` class.
 
 - Avoid conflicting signal registrations when run under mod_wsgi.

src/App/Undo.py

@@ -47,7 +47,7 @@ class UndoSupport(ExtensionClass.Base):
         last_transaction=20,
         )
 
-    def get_request_var_or_attr(self, name, default):
+    def _get_request_var_or_attr(self, name, default):
         if hasattr(self, 'REQUEST'):
             REQUEST=self.REQUEST
             if REQUEST.has_key(name):
@@ -71,15 +71,15 @@ class UndoSupport(ExtensionClass.Base):
                               PrincipiaUndoBatchSize=None):
 
         if first_transaction is None:
-            first_transaction = self.get_request_var_or_attr(
+            first_transaction = self._get_request_var_or_attr(
                 'first_transaction', 0)
 
         if PrincipiaUndoBatchSize is None:
-            PrincipiaUndoBatchSize = self.get_request_var_or_attr(
+            PrincipiaUndoBatchSize = self._get_request_var_or_attr(
                 'PrincipiaUndoBatchSize', 20)
 
         if last_transaction is None:
-            last_transaction = self.get_request_var_or_attr(
+            last_transaction = self._get_request_var_or_attr(
                 'last_transaction',
                 first_transaction+PrincipiaUndoBatchSize)
 

src/App/interfaces.py

@@ -57,10 +57,6 @@ class IUndoSupport(Interface):
 
     manage_UndoForm = Attribute("""Manage Undo form""")
 
-    def get_request_var_or_attr(name, default):
-        """
-        """
-
     def undoable_transactions(first_transaction=None,
                               last_transaction=None,
                               PrincipiaUndoBatchSize=None):