removed more calls to file()

3 files changed, 6 insertions, 6 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Ohai.py b/src/lib/Bcfg2/Server/Plugins/Ohai.py
index 5fff20d98..20f9ba877 100644
--- a/src/lib/Bcfg2/Server/Plugins/Ohai.py
+++ b/src/lib/Bcfg2/Server/Plugins/Ohai.py
@@ -41,7 +41,7 @@ class OhaiCache(object):
             # simply return if the client returned nothing
             return
         self.cache[item] = json.loads(value)
-        file("%s/%s.json" % (self.dirname, item), 'w').write(value)
+        open("%s/%s.json" % (self.dirname, item), 'w').write(value)
 
     def __getitem__(self, item):
         if item not in self.cache:
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
index 8775dec5a..130741fc3 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
@@ -4,7 +4,7 @@ import sys
 import Bcfg2.Server.Plugin
 from Bcfg2.Bcfg2Py3k import HTTPError, HTTPBasicAuthHandler, \
      HTTPPasswordMgrWithDefaultRealm, install_opener, build_opener, \
-     urlopen, file, cPickle
+     urlopen, cPickle
 
 try:
     from hashlib import md5
@@ -233,7 +233,7 @@ class Source(Bcfg2.Server.Plugin.Debuggable):
             fname = self.escape_url(url)
             try:
                 data = fetch_url(url)
-                file(fname, 'w').write(data)
+                open(fname, 'w').write(data)
             except ValueError:
                 self.logger.error("Packages: Bad url string %s" % url)
                 raise
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
index 24187d7a9..f20190ea0 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
@@ -8,7 +8,7 @@ import lxml.etree
 from subprocess import Popen, PIPE
 import Bcfg2.Server.Plugin
 from Bcfg2.Bcfg2Py3k import StringIO, cPickle, HTTPError, URLError, \
-    ConfigParser, file
+    ConfigParser
 from Bcfg2.Server.Plugins.Packages.Collection import Collection
 from Bcfg2.Server.Plugins.Packages.Source import SourceInitError, Source, \
      fetch_url
@@ -613,14 +613,14 @@ class YumSource(Source):
 
     def save_state(self):
         if not self.use_yum:
-            cache = file(self.cachefile, 'wb')
+            cache = open(self.cachefile, 'wb')
             cPickle.dump((self.packages, self.deps, self.provides,
                           self.filemap, self.url_map), cache, 2)
             cache.close()
 
     def load_state(self):
         if not self.use_yum:
-            data = file(self.cachefile)
+            data = open(self.cachefile)
             (self.packages, self.deps, self.provides,
              self.filemap, self.url_map) = cPickle.load(data)