summaryrefslogtreecommitdiff
path: root/novaclient/v2/shell.py
diff options
context:
space:
mode:
Diffstat (limited to 'novaclient/v2/shell.py')
-rw-r--r--novaclient/v2/shell.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/novaclient/v2/shell.py b/novaclient/v2/shell.py
index 4f713906..e7a856ec 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") %
@@ -1895,7 +1897,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") % {