daemonize/prserv/tests/fetch: Convert file() -> open()

Use python3 compatible functions.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/lib/bb/daemonize.py b/lib/bb/daemonize.py
index 346a6185820ab5e3365e85d649795a99c4283c17..ab4a9546228a71e268431bcaa2143e3837955f3e 100644 (file)
--- a/lib/bb/daemonize.py
+++ b/lib/bb/daemonize.py
@@ -178,8 +178,8 @@ def createDaemon(function, logfile):
 #    os.dup2(0, 2)                      # standard error (2)
 
 
-    si = file('/dev/null', 'r')
-    so = file(logfile, 'w')
+    si = open('/dev/null', 'r')
+    so = open(logfile, 'w')
     se = so
 
 

diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py
index 4ba688bfeadaf1a59e5a9dfc32dd374c98ee17d6..cba783f5abaa999a8f4ef93c68b340e92dd285a7 100644 (file)
--- a/lib/bb/tests/fetch.py
+++ b/lib/bb/tests/fetch.py
@@ -450,7 +450,7 @@ class MirrorUriTest(FetcherTest):
 class FetcherLocalTest(FetcherTest):
     def setUp(self):
         def touch(fn):
-            with file(fn, 'a'):
+            with open(fn, 'a'):
                 os.utime(fn, None)
 
         super(FetcherLocalTest, self).setUp()

diff --git a/lib/prserv/serv.py b/lib/prserv/serv.py
index affccd9b3b2733a17e9280324160ceb15d8ec1aa..8cec9f88701a45e06191b03e21ed6717bb935341 100644 (file)
--- a/lib/prserv/serv.py
+++ b/lib/prserv/serv.py
@@ -242,8 +242,8 @@ class PRServer(SimpleXMLRPCServer):
 
         sys.stdout.flush()
         sys.stderr.flush()
-        si = file('/dev/null', 'r')
-        so = file(self.logfile, 'a+')
+        si = open('/dev/null', 'r')
+        so = open(self.logfile, 'a+')
         se = so
         os.dup2(si.fileno(),sys.stdin.fileno())
         os.dup2(so.fileno(),sys.stdout.fileno())
@@ -263,7 +263,7 @@ class PRServer(SimpleXMLRPCServer):
 
         # write pidfile
         pid = str(os.getpid()) 
-        pf = file(self.pidfile, 'w')
+        pf = open(self.pidfile, 'w')
         pf.write("%s\n" % pid)
         pf.close()
 
@@ -323,7 +323,7 @@ def start_daemon(dbfile, host, port, logfile):
     ip = socket.gethostbyname(host)
     pidfile = PIDPREFIX % (ip, port)
     try:
-        pf = file(pidfile,'r')
+        pf = open(pidfile,'r')
         pid = int(pf.readline().strip())
         pf.close()
     except IOError:
@@ -350,7 +350,7 @@ def stop_daemon(host, port):
     ip = socket.gethostbyname(host)
     pidfile = PIDPREFIX % (ip, port)
     try:
-        pf = file(pidfile,'r')
+        pf = open(pidfile,'r')
         pid = int(pf.readline().strip())
         pf.close()
     except IOError: