mercurial/ui.py
changeset 25660 328739ea70c3
parent 25629 52e5f68d8363
child 25989 2cc4e8385661
equal deleted inserted replaced
25659:d60678a567a9 25660:328739ea70c3
   151         trusted = sections or trust or self._trusted(fp, filename)
   151         trusted = sections or trust or self._trusted(fp, filename)
   152 
   152 
   153         try:
   153         try:
   154             cfg.read(filename, fp, sections=sections, remap=remap)
   154             cfg.read(filename, fp, sections=sections, remap=remap)
   155             fp.close()
   155             fp.close()
   156         except error.ConfigError, inst:
   156         except error.ConfigError as inst:
   157             if trusted:
   157             if trusted:
   158                 raise
   158                 raise
   159             self.warn(_("ignored: %s\n") % str(inst))
   159             self.warn(_("ignored: %s\n") % str(inst))
   160 
   160 
   161         if self.plain():
   161         if self.plain():
   603                 self.ferr.write(str(a))
   603                 self.ferr.write(str(a))
   604             # stderr may be buffered under win32 when redirected to files,
   604             # stderr may be buffered under win32 when redirected to files,
   605             # including stdout.
   605             # including stdout.
   606             if not getattr(self.ferr, 'closed', False):
   606             if not getattr(self.ferr, 'closed', False):
   607                 self.ferr.flush()
   607                 self.ferr.flush()
   608         except IOError, inst:
   608         except IOError as inst:
   609             if inst.errno not in (errno.EPIPE, errno.EIO, errno.EBADF):
   609             if inst.errno not in (errno.EPIPE, errno.EIO, errno.EBADF):
   610                 raise
   610                 raise
   611 
   611 
   612     def flush(self):
   612     def flush(self):
   613         try: self.fout.flush()
   613         try: self.fout.flush()