← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/annotate.py

  • Committer: John Arbash Meinel
  • Date: 2009-12-10 17:16:19 UTC
  • mfrom: (4884 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4889.
  • Revision ID: john@arbash-meinel.com-20091210171619-ehdcxjbl8afhq9g1
Bring in bzr.dev 4884

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:
 
461
except ImportError, e:
 
462
    osutils.failed_to_load_extension(e)
462
463
    from bzrlib._annotator_py import Annotator