removed calls to built-in file()/io.FileIO() in favor of read()

4 files changed, 9 insertions, 17 deletions

diff --git a/src/lib/Bcfg2/Bcfg2Py3k.py b/src/lib/Bcfg2/Bcfg2Py3k.py
index 7b0c6a2b5..7fce94789 100644
--- a/src/lib/Bcfg2/Bcfg2Py3k.py
+++ b/src/lib/Bcfg2/Bcfg2Py3k.py
@@ -88,11 +88,6 @@ except NameError:
     import functools
     reduce = functools.reduce
 
-if sys.hexversion >= 0x03000000:
-    from io import FileIO as file
-else:
-    file = file
-
 try:
     from collections import MutableMapping
 except ImportError:
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
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py b/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
index 83f7bbd10..685cd5c1d 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
@@ -2,8 +2,7 @@ import re
 import gzip
 from Bcfg2.Server.Plugins.Packages.Collection import Collection
 from Bcfg2.Server.Plugins.Packages.Source import Source
-from Bcfg2.Bcfg2Py3k import cPickle, file
-
+from Bcfg2.Bcfg2Py3k import cPickle
 
 class AptCollection(Collection):
     def get_group(self, group):
@@ -25,13 +24,13 @@ class AptSource(Source):
                          'components': self.components, 'arches': self.arches}]
 
     def save_state(self):
-        cache = file(self.cachefile, 'wb')
+        cache = open(self.cachefile, 'wb')
         cPickle.dump((self.pkgnames, self.deps, self.provides,
                       self.essentialpkgs), cache, 2)
         cache.close()
 
     def load_state(self):
-        data = file(self.cachefile)
+        data = open(self.cachefile)
         (self.pkgnames, self.deps, self.provides,
          self.essentialpkgs) = cPickle.load(data)
 
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py b/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py
index 99a090739..34c7b42c1 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py
@@ -1,6 +1,6 @@
 import gzip
 import tarfile
-from Bcfg2.Bcfg2Py3k import cPickle, file
+from Bcfg2.Bcfg2Py3k import cPickle
 from Bcfg2.Server.Plugins.Packages.Collection import Collection
 from Bcfg2.Server.Plugins.Packages.Source import Source
 
@@ -9,6 +9,7 @@ class PacCollection(Collection):
         self.logger.warning("Packages: Package groups are not supported by Pacman")
         return []
 
+
 class PacSource(Source):
     basegroups = ['arch', 'parabola']
     ptype = 'pacman'
@@ -22,13 +23,13 @@ class PacSource(Source):
                          'components': self.components, 'arches': self.arches}]
 
     def save_state(self):
-        cache = file(self.cachefile, 'wb')
+        cache = open(self.cachefile, 'wb')
         cPickle.dump((self.pkgnames, self.deps, self.provides),
                      cache, 2)
         cache.close()
 
     def load_state(self):
-        data = file(self.cachefile)
+        data = open(self.cachefile)
         self.pkgnames, self.deps, self.provides = cPickle.load(data)
 
     def filter_unknown(self, unknown):