Log message for revision 123754: Merge c123753 from 2.12 branch Changed: U Zope/branches/2.13/doc/CHANGES.rst U Zope/branches/2.13/src/App/Undo.py U Zope/branches/2.13/src/App/interfaces.py
-=- Modified: Zope/branches/2.13/doc/CHANGES.rst =================================================================== --- Zope/branches/2.13/doc/CHANGES.rst 2011-12-12 13:25:47 UTC (rev 123753) +++ Zope/branches/2.13/doc/CHANGES.rst 2011-12-12 13:27:42 UTC (rev 123754) @@ -8,6 +8,8 @@ 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. Modified: Zope/branches/2.13/src/App/Undo.py =================================================================== --- Zope/branches/2.13/src/App/Undo.py 2011-12-12 13:25:47 UTC (rev 123753) +++ Zope/branches/2.13/src/App/Undo.py 2011-12-12 13:27:42 UTC (rev 123754) @@ -47,7 +47,7 @@ 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 @@ 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) Modified: Zope/branches/2.13/src/App/interfaces.py =================================================================== --- Zope/branches/2.13/src/App/interfaces.py 2011-12-12 13:25:47 UTC (rev 123753) +++ Zope/branches/2.13/src/App/interfaces.py 2011-12-12 13:27:42 UTC (rev 123754) @@ -57,10 +57,6 @@ 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): _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins