diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2011-05-03 14:04:35 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2011-05-03 14:04:35 -0500 |
commit | 1f5b1dd445ca673e26c1a5723fa820726aa48094 (patch) | |
tree | 54a4530bbf0bb2fa4e8f8dfa86cfc43efbffef0b /src/lib/Server/Plugin.py | |
parent | 8bc620dd945a001754d01c87974a71ff078dc85a (diff) | |
download | bcfg2-1f5b1dd445ca673e26c1a5723fa820726aa48094.tar.gz bcfg2-1f5b1dd445ca673e26c1a5723fa820726aa48094.tar.bz2 bcfg2-1f5b1dd445ca673e26c1a5723fa820726aa48094.zip |
Plugins: Handle builtin file type for PY3K
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Server/Plugin.py')
-rw-r--r-- | src/lib/Server/Plugin.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py index 6351a9eb1..cd2b63656 100644 --- a/src/lib/Server/Plugin.py +++ b/src/lib/Server/Plugin.py @@ -18,6 +18,9 @@ import Bcfg2.Options # py3k compatibility if sys.hexversion >= 0x03000000: from functools import reduce + from io import FileIO as BUILTIN_FILE_TYPE +else: + BUILTIN_FILE_TYPE = file from Bcfg2.Bcfg2Py3k import Queue from Bcfg2.Bcfg2Py3k import Empty from Bcfg2.Bcfg2Py3k import Full @@ -346,7 +349,7 @@ class FileBacked(object): if event and event.code2str() not in ['exists', 'changed', 'created']: return try: - self.data = file(self.name).read() + self.data = BUILTIN_FILE_TYPE(self.name).read() self.Index() except IOError: logger.error("Failed to read file %s" % (self.name)) @@ -577,7 +580,7 @@ class XMLSrc(XMLFileBacked): def HandleEvent(self, _=None): """Read file upon update.""" try: - data = file(self.name).read() + data = BUILTIN_FILE_TYPE(self.name).read() except IOError: logger.error("Failed to read file %s" % (self.name)) return |