diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-09 11:23:37 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-09 11:52:19 -0400 |
| commit | c8ca57745a5ba5859ade9f36cd57b80210cc01f8 (patch) | |
| tree | d9e3f655d9e4c037b6de46944733935442af72d9 /src/lib/Bcfg2/Server/Plugin.py | |
| parent | c3d1a9b1ea3a561f9cda1fafa5ec4112f63297af (diff) | |
| download | bcfg2-c8ca57745a5ba5859ade9f36cd57b80210cc01f8.tar.gz bcfg2-c8ca57745a5ba5859ade9f36cd57b80210cc01f8.tar.bz2 bcfg2-c8ca57745a5ba5859ade9f36cd57b80210cc01f8.zip | |
removed calls to built-in file()/io.FileIO() in favor of read()
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugin.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugin.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin.py b/src/lib/Bcfg2/Server/Plugin.py index 7fe98ea92..79350f800 100644 --- a/src/lib/Bcfg2/Server/Plugin.py +++ b/src/lib/Bcfg2/Server/Plugin.py @@ -22,9 +22,6 @@ except ImportError: # 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 @@ -434,7 +431,7 @@ class FileBacked(object): if event and event.code2str() not in ['exists', 'changed', 'created']: return try: - self.data = BUILTIN_FILE_TYPE(self.name).read() + self.data = open(self.name).read() self.Index() except IOError: err = sys.exc_info()[1] @@ -847,7 +844,7 @@ class XMLSrc(XMLFileBacked): def HandleEvent(self, _=None): """Read file upon update.""" try: - data = BUILTIN_FILE_TYPE(self.name).read() + data = open(self.name).read() except IOError: logger.error("Failed to read file %s" % (self.name)) return |