[Zope-Checkins] CVS: Zope/lib/python/OFS - History.py:1.16

Chris McDonough chrism@zope.com
22 Dec 2002 18:08:38 -0500


It's fixed.

On Sun, 2002-12-22 at 17:06, Guido van Rossum wrote:
> > It was a blind merge from the 2.6 branch.  No harm.
> 
> It's a step back.  There's no need to escape a single quote inside a
> double-quoted (or triply-double-quoted) string, and doing this can
> cause people to stop and ponder "why", or, worse, copy the bad
> example.
> 
> --Guido van Rossum (home page: http://www.python.org/~guido/)
> 
> > On Sun, 2002-12-22 at 13:55, Florent Guillaume wrote:
> > > In article <200212161729.gBGHTii11530@cvs.baymountain.com> you write:
> > > > Log Message:
> > > > Merge from 2.6 branch (collector #700).
> > > > 
> > > > 
> > > > === Zope/lib/python/OFS/History.py 1.15 => 1.16 ===
> > > > --- Zope/lib/python/OFS/History.py:1.15	Tue Nov 12 16:17:03 2002
> > > > +++ Zope/lib/python/OFS/History.py	Mon Dec 16 12:29:43 2002
> > > > @@ -36,7 +36,7 @@
> > > >  
> > > >      def commit(self, object, transaction):
> > > >          if object._p_changed:
> > > > -            raise TemporalParadox, "You can't change history!"
> > > > +            raise TemporalParadox, "You can\'t change history!"
> > > >  
> > > >      def abort(*args, **kw): pass
> > > >  
> > > > @@ -53,7 +53,7 @@
> > > >      return rev
> > > >  
> > > >  class Historian(Implicit):
> > > > -    """An Historian's job is to find hysterical revisions of
> > > > +    """An Historian\'s job is to find hysterical revisions of
> > > >      objects, given a time."""
> > > >  
> > > >      def __getitem__(self, key):
> > > > @@ -68,7 +68,7 @@
> > > >          return rev.__of__(self.aq_parent)
> > > >  
> > > >      def manage_workspace(self, REQUEST):
> > > > -        "We aren't real, so we delegate to that that spawned us!"
> > > > +        "We aren\'t real, so we delegate to that that spawned us!"
> > > >          raise 'Redirect', REQUEST['URL2']+'/manage_change_history_page'
> > > 
> > > Hm, what's that for?
> > > 
> > > Florent