diff options
Diffstat (limited to 'giscanner/scannermain.py')
| -rw-r--r-- | giscanner/scannermain.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py index ca9065b2..957ba0b7 100644 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -334,7 +334,7 @@ def extract_filelist(options): filenames = [] if not os.path.exists(options.filelist): _error('%s: no such filelist file' % (options.filelist, )) - with open(options.filelist, "r") as filelist_file: + with open(options.filelist, "r", encoding=None) as filelist_file: lines = filelist_file.readlines() for line in lines: # We don't support real C++ parsing yet, but we should be able @@ -472,6 +472,10 @@ def write_output(data, options): """Write encoded XML 'data' to the filename specified in 'options'.""" if options.output == "-": output = sys.stdout + try: + output.write(data) + except IOError as e: + _error("while writing output: %s" % (e.strerror, )) elif options.reparse_validate_gir: main_f, main_f_name = tempfile.mkstemp(suffix='.gir') @@ -500,14 +504,10 @@ def write_output(data, options): return 0 else: try: - output = open(options.output, 'wb') + with open(options.output, 'wb') as output: + output.write(data) except IOError as e: - _error("opening output for writing: %s" % (e.strerror, )) - - try: - output.write(data) - except IOError as e: - _error("while writing output: %s" % (e.strerror, )) + _error("opening/writing output: %s" % (e.strerror, )) def get_source_root_dirs(options, filenames): |