git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
open() instead of file()
[sfa.git]
/
sfa
/
client
/
sfaclientlib.py
diff --git
a/sfa/client/sfaclientlib.py
b/sfa/client/sfaclientlib.py
index
ebadb01
..
b7114be
100644
(file)
--- a/
sfa/client/sfaclientlib.py
+++ b/
sfa/client/sfaclientlib.py
@@
-306,15
+306,12
@@
class SfaClientBootstrap:
# return Credential(filename=self.my_credential()).save_to_string()
# but in order to make it simpler to other implementations/languages..
def plain_read(self, filename):
# return Credential(filename=self.my_credential()).save_to_string()
# but in order to make it simpler to other implementations/languages..
def plain_read(self, filename):
- infile = file(filename, "r")
- result = infile.read()
- infile.close()
- return result
+ with open(filename) as infile:
+ return infile.read()
def plain_write(self, filename, contents):
def plain_write(self, filename, contents):
- outfile = file(filename, "w")
- result = outfile.write(contents)
- outfile.close()
+ with open(filename, "w") as outfile:
+ outfile.write(contents)
def assert_filename(self, filename, kind):
if not os.path.isfile(filename):
def assert_filename(self, filename, kind):
if not os.path.isfile(filename):
@@
-337,7
+334,7
@@
class SfaClientBootstrap:
def wrap(f):
def wrapped(self, *args, **kw):
filename = filename_method(self, *args, **kw)
def wrap(f):
def wrapped(self, *args, **kw):
filename = filename_method(self, *args, **kw)
- if os.path.isfile(
filename
):
+ if os.path.isfile(
filename
):
if not validate_method:
return filename
elif validate_method(self, filename):
if not validate_method:
return filename
elif validate_method(self, filename):