/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/annotate.py

  • Committer: John Arbash Meinel
  • Date: 2009-09-11 18:18:47 UTC
  • mto: (4634.40.4 2.0.0)
  • mto: This revision was merged to the branch mainline in revision 4705.
  • Revision ID: john@arbash-meinel.com-20090911181847-ii1ktvh0m3e8ptb1
Fix the tests.

While I'm here, handle the fact that bzr-gtk used formats of the form:
  version_info = (0, 97, 0, 'dev', 1)
Which would break formatting because we didn't allow >0 with 'dev'
or 'final'. We still don't allow final. but now we print
 0.97.0.dev.1 rather than failing

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/annotate.py
458
458
 
459
459
try:
460
460
    from bzrlib._annotator_pyx import Annotator
461
 
except ImportError, e:
462
 
    osutils.failed_to_load_extension(e)
 
461
except ImportError:
463
462
    from bzrlib._annotator_py import Annotator