/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: Martin
  • Date: 2010-05-20 21:45:02 UTC
  • mto: This revision was merged to the branch mainline in revision 5246.
  • Revision ID: gzlist@googlemail.com-20100520214502-ytsaoouqzq901jfd
Move pywintypes ModuleAvailableFeature to bzrlib.tests.features

Show diffs side-by-side

added added

removed removed

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