equal
deleted
inserted
replaced
364 cfg.read(filename, fp, sections=sections, remap=remap) |
364 cfg.read(filename, fp, sections=sections, remap=remap) |
365 fp.close() |
365 fp.close() |
366 except error.ConfigError as inst: |
366 except error.ConfigError as inst: |
367 if trusted: |
367 if trusted: |
368 raise |
368 raise |
369 self.warn(_("ignored: %s\n") % str(inst)) |
369 self.warn(_("ignored: %s\n") % util.forcebytestr(inst)) |
370 |
370 |
371 if self.plain(): |
371 if self.plain(): |
372 for k in ('debug', 'fallbackencoding', 'quiet', 'slash', |
372 for k in ('debug', 'fallbackencoding', 'quiet', 'slash', |
373 'logtemplate', 'statuscopies', 'style', |
373 'logtemplate', 'statuscopies', 'style', |
374 'traceback', 'verbose'): |
374 'traceback', 'verbose'): |