/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: Robert Collins
  • Date: 2010-05-11 08:36:16 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511083616-b8fjb19zomwupid0
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.

Show diffs side-by-side

added added

removed removed

Lines of Context:
111
111
 
112
112
 
113
113
def note(*args, **kwargs):
114
 
    """Output a note to the user.
115
 
 
116
 
    Takes the same parameters as logging.info.
117
 
 
118
 
    :return: None
119
 
    """
120
114
    # FIXME note always emits utf-8, regardless of the terminal encoding
121
115
    #
122
116
    # FIXME: clearing the ui and then going through the abstract logging
498
492
    elif not getattr(exc_object, 'internal_error', True):
499
493
        report_user_error(exc_info, err_file)
500
494
        return errors.EXIT_ERROR
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"):
 
495
    elif isinstance(exc_object, (OSError, IOError)):
504
496
        # Might be nice to catch all of these and show them as something more
505
497
        # specific, but there are too many cases at the moment.
506
498
        report_user_error(exc_info, err_file)