On Tue, Nov 25, 2008 at 8:44 PM, Bill Page <[EMAIL PROTECTED]> wrote: > > On Tue, Nov 25, 2008 at 11:10 PM, Tim Lahey wrote: >> ... >> However, it sage_timeit.py there should be the class, >> >> class SageTimeitResult(): >> r""" >> I represent the statistics of a timeit() command. I print as a >> string so >> that I can be easily returned to a user. >> """ >> def __init__(self, stats): >> self.stats = stats >> >> def __repr__(self): >> return "%d loops, best of %d: %.*g %s per loop" % self.stat >> >> That's where I'm getting the stats from. I agree with Mike Hansen >> that you probably have two heads that need to be merged. >> > > After the merge the dates on the 'sage_timeit.py' file did not change > and there is no 'class SageTimeitResult' in that file.
You definitely haven't upgraded to sage-3.2 then. Try this from sage: sage: hg_sage.ci() sage: hg_sage.pull() sage: hg_sage.merge() sage: hg_sage.update() sage: quit sage -br Then try the integration stuff. > >> Sorry about this. >> > > No problem. I'll try to get this right. If all else fails I guess I > can re-build from source and re-apply the changes (actually just > Mike's patches from the trac item for axiom). > > Regards, > Bill Page. > > > > -- William Stein Associate Professor of Mathematics University of Washington http://wstein.org --~--~---------~--~----~------------~-------~--~----~ To post to this group, send email to sage-devel@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/sage-devel URLs: http://www.sagemath.org -~----------~----~----~----~------~----~------~--~---
