/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/trace.py

  • Committer: Andrew Bennetts
  • Date: 2010-06-04 03:09:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5280.
  • Revision ID: andrew.bennetts@canonical.com-20100604030935-4slnx0e8uh9b8yk6
lazy_import most things in merge.py; add a few representative modules to the import tariff tests; tweak a couple of other modules so that patiencediff is not necessarily imported; remove a bunch of unused imports from test_knit.py.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/trace.py
498
498
    elif not getattr(exc_object, 'internal_error', True):
499
499
        report_user_error(exc_info, err_file)
500
500
        return errors.EXIT_ERROR
501
 
    elif isinstance(exc_object, (OSError, IOError)):
 
501
    elif isinstance(exc_object, (OSError, IOError)) or (
 
502
        # GZ 2010-05-20: Like (exc_type is pywintypes.error) but avoid import
 
503
        exc_type.__name__ == "error" and exc_type.__module__ == "pywintypes"):
502
504
        # Might be nice to catch all of these and show them as something more
503
505
        # specific, but there are too many cases at the moment.
504
506
        report_user_error(exc_info, err_file)