Remove read_file() from __init__.py

supervisor/__init__.py

@@ -1,8 +1 @@
-#__import__('pkg_resources').declare_namespace(__name__)
-
-def read_file(filename, mode='r'):
-    f = open(filename, mode)
-    content = f.read()
-    f.close()
-    return content
-
+# this is a package

supervisor/options.py

@@ -56,13 +56,14 @@ from supervisor.datatypes import set_here
 from supervisor import loggers
 from supervisor import states
 from supervisor import xmlrpc
-from supervisor import read_file
 from supervisor import poller
 
-mydir = os.path.abspath(os.path.dirname(__file__))
-version_txt = os.path.join(mydir, 'version.txt')
-
-VERSION = read_file(version_txt).strip()
+def _read_version_txt():
+    mydir = os.path.abspath(os.path.dirname(__file__))
+    version_txt = os.path.join(mydir, 'version.txt')
+    with open(version_txt, 'r') as f:
+        return f.read().strip()
+VERSION = _read_version_txt()
 
 def normalize_path(v):
     return os.path.normpath(os.path.abspath(os.path.expanduser(v)))

supervisor/pidproxy.py

@@ -49,7 +49,8 @@ class PidProxy:
 
     def passtochild(self, sig, frame):
         try:
-            pid = int(open(self.pidfile, 'r').read().strip())
+            with open(self.pidfile, 'r') as f:
+                pid = int(f.read().strip())
         except:
             print("Can't read child pidfile %s!" % self.pidfile)
             return
@@ -63,6 +64,6 @@ def main():
 
 if __name__ == '__main__':
     main()
-    
-    
-    
+
+
+

supervisor/tests/test_dispatchers.py

@@ -7,7 +7,6 @@ from supervisor.tests.base import DummyProcess
 from supervisor.tests.base import DummyPConfig
 from supervisor.tests.base import DummyLogger
 from supervisor.tests.base import DummyEvent
-from supervisor import read_file
 
 class PDispatcherTests(unittest.TestCase):
     def setUp(self):
@@ -24,11 +23,11 @@ class PDispatcherTests(unittest.TestCase):
 
     def _makeOne(self, process=None, channel='stdout', fd=0):
         return self._getTargetClass()(process, channel, fd)
-    
+
     def test_readable(self):
         inst = self._makeOne()
         self.assertRaises(NotImplementedError, inst.readable)
-        
+
     def test_writable(self):
         inst = self._makeOne()
         self.assertRaises(NotImplementedError, inst.writable)
@@ -36,7 +35,7 @@ class PDispatcherTests(unittest.TestCase):
     def test_flush(self):
         inst = self._makeOne()
         self.assertEqual(inst.flush(), None)
-        
+
 class POutputDispatcherTests(unittest.TestCase):
     def setUp(self):
         from supervisor.events import clear
@@ -316,8 +315,8 @@ class POutputDispatcherTests(unittest.TestCase):
         try:
             dispatcher.output_buffer = data
             dispatcher.record_output()
-            self.assertEqual(read_file(logfile), '')
-            self.assertEqual(dispatcher.output_buffer, '')
+            self.assertEqual(os.path.getsize(logfile), 0)
+            self.assertEqual(len(dispatcher.output_buffer), 0)
             self.assertEqual(len(events), 1)
 
             event = events[0]
@@ -368,23 +367,26 @@ class POutputDispatcherTests(unittest.TestCase):
         try:
             dispatcher.output_buffer = first
             dispatcher.record_output()
-            [ x.flush() for x in dispatcher.childlog.handlers]
-            self.assertEqual(read_file(logfile), letters)
+            [ x.flush() for x in dispatcher.childlog.handlers ]
+            with open(logfile, 'r') as f:
+                self.assertEqual(f.read(), letters)
             self.assertEqual(dispatcher.output_buffer, first[len(letters):])
             self.assertEqual(len(events), 0)
 
             dispatcher.output_buffer += second
             dispatcher.record_output()
             self.assertEqual(len(events), 0)
-            [ x.flush() for x in dispatcher.childlog.handlers]
-            self.assertEqual(read_file(logfile), letters)
+            [ x.flush() for x in dispatcher.childlog.handlers ]
+            with open(logfile, 'r') as f:
+                self.assertEqual(f.read(), letters)
             self.assertEqual(dispatcher.output_buffer, first[len(letters):])
             self.assertEqual(len(events), 0)
 
             dispatcher.output_buffer += third
             dispatcher.record_output()
-            [ x.flush() for x in dispatcher.childlog.handlers]
-            self.assertEqual(read_file(logfile), letters *2)
+            [ x.flush() for x in dispatcher.childlog.handlers ]
+            with open(logfile, 'r') as f:
+                self.assertEqual(f.read(), letters * 2)
             self.assertEqual(len(events), 1)
             event = events[0]
             from supervisor.events import ProcessCommunicationStdoutEvent
@@ -506,8 +508,8 @@ class POutputDispatcherTests(unittest.TestCase):
             warnings.simplefilter('always')
             self._makeOne(process)
             self.assertEqual(len(w), 1)
-        
-        
+
+
 
 
 class PInputDispatcherTests(unittest.TestCase):

supervisor/tests/test_loggers.py

@@ -12,7 +12,6 @@ from supervisor.compat import as_string
 
 from supervisor.tests.base import mock
 from supervisor.tests.base import DummyStream
-from supervisor import read_file
 
 class LevelTests(unittest.TestCase):
     def test_LOG_LEVELS_BY_NUM_doesnt_include_builtins(self):
@@ -176,14 +175,16 @@ class FileHandlerTests(HandlerTests, unittest.TestCase):
         record = self._makeLogRecord('hello!')
         handler.emit(record)
         handler.close()
-        self.assertEqual(read_file(self.filename,'r'), 'hello!')
+        with open(self.filename, 'r') as f:
+            self.assertEqual(f.read(), 'hello!')
 
+# TODO uncomment and fix
 #    def test_emit_unicode_noerror(self):
 #        handler = self._makeOne(self.filename)
 #        record = self._makeLogRecord(u'fi\xed')
 #        handler.emit(record)
-#        content = open(self.filename, 'r').read()
-#        self.assertEqual(content, 'fi\xc3\xad')
+#        with open(self.filename, 'r') as f:
+#            self.assertEqual(f.read(), 'fi\xc3\xad')
 
     def test_emit_error(self):
         handler = self._makeOne(self.filename)
@@ -245,11 +246,14 @@ class RotatingFileHandlerTests(FileHandlerTests):
         self.assertTrue(os.path.exists(self.filename + '.1'))
         self.assertTrue(os.path.exists(self.filename + '.2'))
 
-        self.assertEqual(read_file(self.filename), 'a' * 4)
-        one = read_file(self.filename+'.1')
-        self.assertEqual(one, 'a'*12)
-        two = read_file(self.filename+'.2')
-        self.assertEqual(two, 'a'*12)
+        with open(self.filename, 'r') as f:
+            self.assertEqual(f.read(), 'a' * 4)
+
+        with open(self.filename+'.1', 'r') as f:
+            self.assertEqual(f.read(), 'a' * 12)
+
+        with open(self.filename+'.2', 'r') as f:
+            self.assertEqual(f.read(), 'a' * 12)
 
     def test_current_logfile_removed(self):
         handler = self._makeOne(self.filename, maxBytes=6, backupCount=1)

supervisor/tests/test_options.py

@@ -10,7 +10,6 @@ import signal
 import shutil
 import errno
 
-from supervisor import read_file
 from supervisor.compat import StringIO
 from supervisor.compat import as_bytes
 
@@ -981,7 +980,8 @@ class ServerOptionsTests(unittest.TestCase):
             instance.pidfile = fn
             instance.write_pidfile()
             self.assertTrue(os.path.exists(fn))
-            pid = int(read_file(fn)[:-1])
+            with open(fn, 'r') as f:
+                pid = int(f.read().strip())
             self.assertEqual(pid, os.getpid())
             msg = instance.logger.data[0]
             self.assertTrue(msg.startswith('supervisord started with pid'))