~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/trace.py

  • Committer: Vincent Ladeuil
  • Date: 2011-09-29 15:50:58 UTC
  • mfrom: (6177 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6178.
  • Revision ID: v.ladeuil+lp@free.fr-20110929155058-zgbecmx1huzktegm
Merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
559
559
    try:
560
560
        sys.stdout.flush()
561
561
        sys.stderr.flush()
 
562
    except ValueError, e:
 
563
        # On Windows, I get ValueError calling stdout.flush() on a closed
 
564
        # handle
 
565
        pass
562
566
    except IOError, e:
563
567
        import errno
564
568
        if e.errno in [errno.EINVAL, errno.EPIPE]: