Project/Project.py

branch
Py2 comp.
changeset 3178
f25fc1364c88
parent 3161
06f57a834adf
parent 3164
a027fc190f82
child 3484
645c12de6b0c
--- a/Project/Project.py	Wed Jan 01 14:39:32 2014 +0100
+++ b/Project/Project.py	Sun Jan 05 23:22:17 2014 +0100
@@ -2087,16 +2087,12 @@
                         os.makedirs(tpd)
                 
                 # create management directory if not present
-                mgmtDir = self.getProjectManagementDir()
-                if not os.path.exists(mgmtDir):
-                    os.makedirs(mgmtDir)
+                self.createProjectManagementDir()
                 
                 self.saveProject()
             else:
                 # create management directory if not present
-                mgmtDir = self.getProjectManagementDir()
-                if not os.path.exists(mgmtDir):
-                    os.makedirs(mgmtDir)
+                self.createProjectManagementDir()
                 
                 try:
                     ms = os.path.join(self.ppath, self.pdata["MAINSCRIPT"][0])
@@ -2520,9 +2516,7 @@
                     QApplication.processEvents()
                     
                     # create the management directory if not present
-                    mgmtDir = self.getProjectManagementDir()
-                    if not os.path.exists(mgmtDir):
-                        os.mkdir(mgmtDir)
+                    self.createProjectManagementDir()
                     
                     # read a user specific project file
                     self.__readUserProperties()
@@ -2707,9 +2701,7 @@
             
             if ok:
                 # create management directory if not present
-                mgmtDir = self.getProjectManagementDir()
-                if not os.path.exists(mgmtDir):
-                    os.makedirs(mgmtDir)
+                self.createProjectManagementDir()
                 
                 # now save the tasks
                 self.writeTasks()
@@ -2916,7 +2908,7 @@
             if normalized:
                 return os.path.join(self.ppath, self.pdata["MAINSCRIPT"][0])
             else:
-                return self.pdata["MAINSCRIPT"]
+                return self.pdata["MAINSCRIPT"][0]
         else:
             return None
         
@@ -3077,6 +3069,17 @@
         else:
             return os.path.join(self.ppath, ".eric5project")
         
+    def createProjectManagementDir(self):
+        """
+        Public method to create the project management directory.
+        
+        It does nothing, if it already exists.
+        """
+        # create management directory if not present
+        mgmtDir = self.getProjectManagementDir()
+        if not os.path.exists(mgmtDir):
+            os.makedirs(mgmtDir)
+        
     def getHash(self):
         """
         Public method to get the project hash.

eric ide

mercurial