diff options
| author | Takashi NATSUME <natsume.takashi@lab.ntt.co.jp> | 2018-10-04 12:02:07 +0900 |
|---|---|---|
| committer | Takashi NATSUME <natsume.takashi@lab.ntt.co.jp> | 2018-10-04 12:22:04 +0900 |
| commit | 47dc339ab9bb2985d750dae11d0b3b8b2c85d2b2 (patch) | |
| tree | 57df2a5184bfbaf04d9917ead1361be91f414f4c /novaclient/v2 | |
| parent | bfbec25e27f712f424aa56941bacd26703ffbab5 (diff) | |
| download | python-novaclient-47dc339ab9bb2985d750dae11d0b3b8b2c85d2b2.tar.gz | |
Follow up "Fix up userdata argument to rebuild"
This patch is a follow-up patch for
I9752d849aa0e6cf608db0def3ca89565cff4debc.
* Add checking a message of an exception in the unit test
* Add 'with' statement when opening a file
* Fix descriptions in the release note
Change-Id: I2c399490f320a202b41a8f8d36710a36621c4853
Diffstat (limited to 'novaclient/v2')
| -rw-r--r-- | novaclient/v2/shell.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/novaclient/v2/shell.py b/novaclient/v2/shell.py index 8a1b9a6d..ae7344bf 100644 --- a/novaclient/v2/shell.py +++ b/novaclient/v2/shell.py @@ -398,7 +398,8 @@ def _boot(cs, args): for f in args.files: try: dst, src = f.split('=', 1) - files[dst] = open(src) + with open(src) as fo: + files[dst] = fo.read() except IOError as e: raise exceptions.CommandError( _("Can't open '%(src)s': %(exc)s") % @@ -416,7 +417,8 @@ def _boot(cs, args): if args.user_data: try: - userdata = open(args.user_data) + with open(args.user_data) as f: + userdata = f.read() except IOError as e: raise exceptions.CommandError(_("Can't open '%(user_data)s': " "%(exc)s") % @@ -1916,7 +1918,8 @@ def do_rebuild(cs, args): "'--user-data'.")) elif args.user_data: try: - kwargs['userdata'] = open(args.user_data) + with open(args.user_data) as f: + kwargs['userdata'] = f.read() except IOError as e: raise exceptions.CommandError( _("Can't open '%(user_data)s': %(exc)s") % { |