Use the with context manager to close files.

Make sure file handles get closed when done with.

Author: pavoljuhas

setup.py

@@ -63,7 +63,8 @@ def getversioncfg():
         cp.set('DEFAULT', 'commit', g['commit'])
         cp.set('DEFAULT', 'date', g['date'])
         cp.set('DEFAULT', 'timestamp', g['timestamp'])
-        cp.write(open(versioncfgfile, 'w'))
+        with open(versioncfgfile, 'w') as fp:
+            cp.write(fp)
     return cp
 
 versiondata = getversioncfg()

src/diffpy/Structure/Parsers/structureparser.py

@@ -73,8 +73,8 @@ def parseFile(self, filename):
         Raise StructureFormatError or IOError.
         """
         self.filename = filename
-        f = open(filename)
-        s = f.read()
+        with open(filename) as fp:
+            s = fp.read()
         stru = self.parse(s)
         return stru
 

src/diffpy/Structure/tests/TestP_cif.py

@@ -78,8 +78,10 @@ def tearDown(self):
     def test_parse(self):
         """check P_cif.parse()
         """
-        sgood = open(self.goodciffile).read()
-        sbad = open(self.badciffile).read()
+        with open(self.goodciffile) as fp1:
+            sgood = fp1.read()
+        with open(self.badciffile) as fp2:
+            sbad = fp2.read()
         pfile, ptest = self.pfile, self.ptest
         stru_check = pfile.parseFile(self.goodciffile)
         stru = ptest.parse(sgood)
@@ -95,8 +97,10 @@ def test_parse(self):
     def test_parseLines(self):
         """check P_cif.parseLines()
         """
-        goodlines = open(self.goodciffile).readlines()
-        badlines = open(self.badciffile).readlines()
+        with open(self.goodciffile) as fp1:
+            goodlines = fp1.readlines()
+        with open(self.badciffile) as fp2:
+            badlines = fp2.readlines()
         pfile, ptest = self.pfile, self.ptest
         stru_check = pfile.parseFile(self.goodciffile)
         stru = ptest.parseLines(goodlines)

src/diffpy/Structure/tests/TestP_discus.py

@@ -97,7 +97,8 @@ def test_ignored_lines(self):
         """
         r1 = 'ignored record 1\n'
         r2 = 'ignored record 2\n'
-        ni_lines = open(datafile('Ni-discus.stru')).readlines()
+        with open(datafile('Ni-discus.stru')) as fp:
+            ni_lines = fp.readlines()
         ni_lines.insert(2, r1)
         ni_lines.insert(4, r2)
         s_s1 = "".join(ni_lines)
@@ -125,7 +126,8 @@ def test_spdiameter_parsing(self):
         stru13 = Structure()
         stru13.readStr(s13)
         self.assertEqual(13, stru13.pdffit['spdiameter'])
-        ni_lines = open(datafile('Ni.stru')).readlines()
+        with open(datafile('Ni.stru')) as fp:
+            ni_lines = fp.readlines()
         ni_lines.insert(3, 'shape invalid, 7\n')
         sbad = ''.join(ni_lines)
         self.assertRaises(StructureFormatError, self.stru.readStr,
@@ -148,7 +150,8 @@ def test_stepcut_parsing(self):
         stru13 = Structure()
         stru13.readStr(s13)
         self.assertEqual(13, stru13.pdffit['stepcut'])
-        ni_lines = open(datafile('Ni.stru')).readlines()
+        with open(datafile('Ni.stru')) as fp:
+            ni_lines = fp.readlines()
         ni_lines.insert(3, 'shape invalid, 7\n')
         sbad = ''.join(ni_lines)
         self.assertRaises(StructureFormatError, self.stru.readStr,

src/diffpy/Structure/tests/TestP_pdffit.py

@@ -153,7 +153,8 @@ def test_writeStr_pdffit(self):
         """check writing of normal xyz file"""
         stru = self.stru
         stru.read(datafile('Ni.stru'), self.format)
-        f_s = open(datafile('Ni.stru')).read()
+        with open(datafile('Ni.stru')) as fp:
+            f_s = fp.read()
         f_s = re.sub('[ \t]+', ' ', f_s)
         f_s = re.sub('[ \t]+\n', '\n', f_s)
         s_s = stru.writeStr(self.format)
@@ -179,7 +180,8 @@ def test_ignored_lines(self):
         """
         r1 = 'ignored record 1'
         r2 = 'ignored record 2'
-        ni_lines = open(datafile('Ni.stru')).readlines()
+        with open(datafile('Ni.stru')) as fp:
+            ni_lines = fp.readlines()
         ni_lines.insert(2, r1 + '\n')
         ni_lines.insert(4, r2 + '\n')
         s_s1 = "".join(ni_lines)
@@ -207,7 +209,8 @@ def test_spdiameter_parsing(self):
         stru13 = Structure()
         stru13.readStr(s13)
         self.assertEqual(13, stru13.pdffit['spdiameter'])
-        ni_lines = open(datafile('Ni.stru')).readlines()
+        with open(datafile('Ni.stru')) as fp:
+            ni_lines = fp.readlines()
         ni_lines.insert(3, 'shape invalid, 7\n')
         sbad = ''.join(ni_lines)
         self.assertRaises(StructureFormatError, self.stru.readStr,
@@ -230,7 +233,8 @@ def test_stepcut_parsing(self):
         stru13 = Structure()
         stru13.readStr(s13)
         self.assertEqual(13, stru13.pdffit['stepcut'])
-        ni_lines = open(datafile('Ni.stru')).readlines()
+        with open(datafile('Ni.stru')) as fp:
+            ni_lines = fp.readlines()
         ni_lines.insert(3, 'shape invalid, 7\n')
         sbad = ''.join(ni_lines)
         self.assertRaises(StructureFormatError, self.stru.readStr,