Merge V9_dev branch into master

[samples/pylight.git] / src / PYLIGHTGUI / PYLIGHT_DataModel.py

diff --git a/src/PYLIGHTGUI/PYLIGHT_DataModel.py b/src/PYLIGHTGUI/PYLIGHT_DataModel.py
index c1b52797e5c8c6c56513ff1445767b0cd7859027..37ba1b3132e90372b7c7c0230b60ab5546070866 100644 (file)
--- a/src/PYLIGHTGUI/PYLIGHT_DataModel.py
+++ b/src/PYLIGHTGUI/PYLIGHT_DataModel.py
@@ -85,32 +85,32 @@ class PYLIGHT_DataModel:
         '''
         Read text file and publish it.
         '''
-        aFile = open(str(filename),"r")
-        lines = aFile.readlines()
-        if(lines[0] != "\n"):
-            paragr = self.createObject()
-        for line in lines:
-            if line == "\n":
+        with open(str(filename), "r") as aFile:
+            lines = aFile.readlines()
+            if(lines[0] != "\n"):
                 paragr = self.createObject()
+            for line in lines:
+                if line == "\n":
+                    paragr = self.createObject()
 
-            else:
-                self.createObject(processText(line), paragr)
+                else:
+                    self.createObject(processText(line), paragr)
+                    pass
                 pass
             pass
-        aFile.close()
         pass
     
     def saveFile(self, filename):
-        aFile = open(str(filename),"w")
-        paragrs = self.getParagraphs()
-        for paragr in paragrs:
-            aFile.write("\n")
-            lines = sgPyQt.getChildren(paragr)
-            for line in lines:
-                aFile.write(str(sgPyQt.getName(line))+"\n")
+        with open(str(filename), "w") as aFile:
+            paragrs = self.getParagraphs()
+            for paragr in paragrs:
+                aFile.write("\n")
+                lines = sgPyQt.getChildren(paragr)
+                for line in lines:
+                    aFile.write(str(sgPyQt.getName(line)) + "\n")
+                    pass
                 pass
             pass
-        aFile.close()
         pass
     pass