diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-22 08:42:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-22 08:42:36 +0000 |
| commit | 18a09024a3876b5729785e2d4cf49e902e36b7a1 (patch) | |
| tree | 6c63c5281e2c26057bac7fe4ac3d1da43b8d4c52 | |
| parent | 2a6ef672b9940dac19cedd359c5aaf8b53daf645 (diff) | |
| parent | 2df48336d0e0381522e9ec100cb56579367cfa1f (diff) | |
| download | glance-18a09024a3876b5729785e2d4cf49e902e36b7a1.tar.gz | |
Merge "Change open(file) to with block"
| -rw-r--r-- | glance/db/sqlalchemy/metadata.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/glance/db/sqlalchemy/metadata.py b/glance/db/sqlalchemy/metadata.py index 64ba8bd15..fb442a494 100644 --- a/glance/db/sqlalchemy/metadata.py +++ b/glance/db/sqlalchemy/metadata.py @@ -132,9 +132,8 @@ def _populate_metadata(meta, metadata_path=None): start=1): try: file = join(metadata_path, json_schema_file) - json_metadata = open(file) - metadata = json.load(json_metadata) - json_metadata.close() + with open(file) as json_file: + metadata = json.load(json_file) except Exception as e: LOG.error(utils.exception_to_str(e)) continue @@ -284,10 +283,8 @@ def _export_data_to_file(meta, path): try: file_name = ''.join([path, namespace_file_name, '.json']) - json_file = open(file_name, 'w+') - json_file.write(json.dumps(values)) - json_file.close() - + with open(file_name, 'w') as json_file: + json_file.write(json.dumps(values)) except Exception as e: LOG.exception(utils.exception_to_str(e)) LOG.info(_LI("Namespace %s saved in %s"), |