From 920b5878175bde46b1e62bd63a5e0434ee037a8c Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Wed, 24 Jun 2009 16:12:46 +0100
Subject: [PATCH] Convert ssconf._ReadFile to utils.ReadFile
Making ssconf._ReadFile a wrapper over utils.ReadFile
Signed-off-by: Guido Trotter <ultrotter@google.com>
---
lib/ssconf.py | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/lib/ssconf.py b/lib/ssconf.py
index 19a95c97a..079218615 100644
--- a/lib/ssconf.py
+++ b/lib/ssconf.py
@@ -166,15 +166,11 @@ class SimpleStore(object):
"""
filename = self.KeyToFilename(key)
try:
- fh = file(filename, 'r')
- try:
- data = fh.read(self._MAX_SIZE)
- data = data.rstrip('\n')
- finally:
- fh.close()
+ data = utils.ReadFile(filename, size=self._MAX_SIZE)
except EnvironmentError, err:
raise errors.ConfigurationError("Can't read from the ssconf file:"
" '%s'" % str(err))
+ data = data.rstrip('\n')
return data
def WriteFiles(self, values):
--
GitLab