projectManagement, ngspicetoModelica, subcircuit made pep8 compliant

5 files changed, 73 insertions, 45 deletions

diff --git a/src/projManagement/Kicad.py b/src/projManagement/Kicad.py
index 2fc17615..2eaef643 100644
--- a/src/projManagement/Kicad.py
+++ b/src/projManagement/Kicad.py
@@ -1,4 +1,4 @@
-#=========================================================================
+# =========================================================================
 #
 #          FILE: openKicad.py
 #
@@ -14,7 +14,7 @@
 #  ORGANIZATION: eSim team at FOSSEE, IIT Bombay.
 #       CREATED: Tuesday 17 Feb 2015
 #      REVISION:  ---
-#=========================================================================
+# =========================================================================
 
 import os
 from . import Validation
@@ -25,7 +25,8 @@ from PyQt4 import QtGui
 
 class Kicad:
     """
-    This class called the Kicad Schematic,KicadtoNgspice Converter,Layout editor and Footprint Editor
+    This class called the Kicad Schematic,KicadtoNgspice Converter,Layout
+    editor and Footprint Editor
     """
 
     def __init__(self, dockarea):
@@ -47,7 +48,7 @@ class Kicad:
         # Validating if current project is available or not
 
         if self.obj_validation.validateKicad(self.projDir):
-            #print "calling Kicad schematic ",self.projDir
+            # print "calling Kicad schematic ",self.projDir
             self.projName = os.path.basename(self.projDir)
             self.project = os.path.join(self.projDir, self.projName)
 
@@ -59,13 +60,16 @@ class Kicad:
         else:
             self.msg = QtGui.QErrorMessage(None)
             self.msg.showMessage(
-                'Please select the project first. You can either create new project or open existing project')
+                'Please select the project first. You can either create'
+                + 'new project or open existing project')
             self.obj_appconfig.print_warning(
-                'Please select the project first. You can either create new project or open existing project')
+                'Please select the project first. You can either create'
+                + 'new project or open existing project')
             self.msg.setWindowTitle("Error Message")
 
     '''
-    #Commenting as it is no longer needed as PBC and Layout will open from eeschema
+    # Commenting as it is no longer needed as PBC and Layout will open from
+    # eeschema
     def openFootprint(self):
         """
         This function create command to open Footprint editor
@@ -73,7 +77,8 @@ class Kicad:
         print "Kicad Foot print Editor called"
         self.projDir = self.obj_appconfig.current_project["ProjectName"]
         try:
-            self.obj_appconfig.print_info('Kicad Footprint Editor is called for project : ' + self.projDir)
+            self.obj_appconfig.print_info('Kicad Footprint Editor is called'
+            + 'for project : ' + self.projDir)
         except:
             pass
         #Validating if current project is available or not
@@ -90,8 +95,11 @@ class Kicad:
 
         else:
             self.msg = QtGui.QErrorMessage(None)
-            self.msg.showMessage('Please select the project first. You can either create new project or open existing project')
-            self.obj_appconfig.print_warning('Please select the project first. You can either create new project or open existing project')
+            self.msg.showMessage('Please select the project first. You can'
+            + 'either create new project or open existing project')
+            self.obj_appconfig.print_warning('Please select the project'
+            + 'first. You can either create new project or open existing'
+            + 'project')
             self.msg.setWindowTitle("Error Message")
 
     def openLayout(self):
@@ -101,7 +109,8 @@ class Kicad:
         print "Kicad Layout is called"
         self.projDir = self.obj_appconfig.current_project["ProjectName"]
         try:
-            self.obj_appconfig.print_info('PCB Layout is called for project : ' + self.projDir)
+            self.obj_appconfig.print_info('PCB Layout is called for project : '
+            + self.projDir)
         except:
             pass
         #Validating if current project is available or not
@@ -117,8 +126,11 @@ class Kicad:
 
         else:
             self.msg = QtGui.QErrorMessage(None)
-            self.msg.showMessage('Please select the project first. You can either create new project or open existing project')
-            self.obj_appconfig.print_warning('Please select the project first. You can either create new project or open existing project')
+            self.msg.showMessage('Please select the project first. You can'
+            + 'either create new project or open existing project')
+            self.obj_appconfig.print_warning('Please select the project'
+            + 'first. You can either create new project or open existing'
+            + 'project')
             self.msg.setWindowTitle("Error Message")
 
     '''
@@ -145,7 +157,8 @@ class Kicad:
 
                 # Creating a command to run
                 """
-                self.cmd = "python  ../kicadtoNgspice/KicadtoNgspice.py " +self.project+".cir "
+                self.cmd = ("python  ../kicadtoNgspice/KicadtoNgspice.py "
+                + "self.project+".cir ")
                 self.obj_workThread = Worker.WorkerThread(self.cmd)
                 self.obj_workThread.start()
                 """
@@ -155,15 +168,19 @@ class Kicad:
             else:
                 self.msg = QtGui.QErrorMessage(None)
                 self.msg.showMessage(
-                    'The project does not contain any Kicad netlist file for conversion.')
+                    'The project does not contain any Kicad netlist file for'
+                    + 'conversion.')
                 self.obj_appconfig.print_error(
-                    'The project does not contain any Kicad netlist file for conversion.')
+                    'The project does not contain any Kicad netlist file for'
+                    + 'conversion.')
                 self.msg.setWindowTitle("Error Message")
 
         else:
             self.msg = QtGui.QErrorMessage(None)
             self.msg.showMessage(
-                'Please select the project first. You can either create new project or open existing project')
+                'Please select the project first. You can either create'
+                + 'new project or open existing project')
             self.obj_appconfig.print_warning(
-                'Please select the project first. You can either create new project or open existing project')
+                'Please select the project first. You can either create'
+                + 'new project or open existing project')
             self.msg.setWindowTitle("Error Message")
diff --git a/src/projManagement/Validation.py b/src/projManagement/Validation.py
index 38d45495..11cdcaf9 100644
--- a/src/projManagement/Validation.py
+++ b/src/projManagement/Validation.py
@@ -1,11 +1,12 @@
 
-#=========================================================================
+# =========================================================================
 #
 #          FILE: Validation.py
 #
 #         USAGE: ---
 #
-#   DESCRIPTION: This module is use to create validation for openProject,newProject and other activity.
+#   DESCRIPTION: This module is use to create validation for openProject,
+#                newProject and other activity.
 #
 #       OPTIONS: ---
 #  REQUIREMENTS: ---
@@ -15,7 +16,7 @@
 #  ORGANIZATION: eSim team at FOSSEE, IIT Bombay.
 #       CREATED: Wednesday 12 February 2015
 #      REVISION:  ---
-#=========================================================================
+# =========================================================================
 import os
 import re
 import distutils.spawn
diff --git a/src/projManagement/Worker.py b/src/projManagement/Worker.py
index fe884ef3..65c67dde 100644
--- a/src/projManagement/Worker.py
+++ b/src/projManagement/Worker.py
@@ -1,4 +1,4 @@
-#=========================================================================
+# =========================================================================
 #
 #          FILE: WorkerThread.py
 #
@@ -14,7 +14,7 @@
 #  ORGANIZATION: eSim team at FOSSEE, IIT Bombay.
 #       CREATED: Tuesday 24 Feb 2015
 #      REVISION:  ---
-#=========================================================================
+# =========================================================================
 from PyQt4 import QtCore
 import subprocess
 from configuration.Appconfig import Appconfig
diff --git a/src/projManagement/newProject.py b/src/projManagement/newProject.py
index f01d2f53..40d66003 100644
--- a/src/projManagement/newProject.py
+++ b/src/projManagement/newProject.py
@@ -1,5 +1,5 @@
 
-#=========================================================================
+# =========================================================================
 #
 #          FILE: newProject.py
 #
@@ -15,7 +15,7 @@
 #  ORGANIZATION: eSim team at FOSSEE, IIT Bombay.
 #       CREATED: Wednesday 12 February 2015
 #      REVISION:  ---
-#=========================================================================
+# =========================================================================
 from PyQt4 import QtGui
 from .Validation import Validation
 from configuration.Appconfig import Appconfig
@@ -37,10 +37,10 @@ class NewProjectInfo(QtGui.QWidget):
         """
         This function create Project related directories and files
         """
-        #print "Create Project Called"
+        # print "Create Project Called"
         self.projName = projName
         self.workspace = self.obj_appconfig.default_workspace['workspace']
-        #self.projName = self.projEdit.text()
+        # self.projName = self.projEdit.text()
         # Remove leading and trailing space
         self.projName = str(self.projName).rstrip().lstrip()
 
@@ -62,18 +62,19 @@ class NewProjectInfo(QtGui.QWidget):
                     self.projDir, self.projName + ".proj")
                 f = open(self.projFile, "w")
             except BaseException:
-                #print "Some Thing Went Wrong"
+                # print "Some Thing Went Wrong"
                 self.msg = QtGui.QErrorMessage(self)
                 self.msg.showMessage(
-                    'Unable to create project. Please make sure you have write permission on ' +
-                    self.workspace)
+                    'Unable to create project. Please make sure you have'
+                    + 'write permission on '
+                    + self.workspace)
                 self.msg.setWindowTitle("Error Message")
             f.write("schematicFile " + self.projName + ".sch\n")
             f.close()
 
             # Now Change the current working project
             newprojlist = []
-            #self.obj_appconfig = Appconfig()
+            # self.obj_appconfig = Appconfig()
             self.obj_appconfig.current_project['ProjectName'] = self.projDir
             newprojlist.append(self.projName + '.proj')
             self.obj_appconfig.project_explorer[self.projDir] = newprojlist
@@ -89,23 +90,24 @@ class NewProjectInfo(QtGui.QWidget):
             return self.projDir, newprojlist
 
         elif self.reply == "CHECKEXIST":
-            #print "Project already exist"
+            # print "Project already exist"
             self.msg = QtGui.QErrorMessage(self)
             self.msg.showMessage(
-                'The project "' +
-                self.projName +
-                '" already exist.Please select the different name or delete existing project')
+                'The project "'
+                + self.projName
+                + '" already exist.Please select the different name or delete'
+                + ' existing project')
             self.msg.setWindowTitle("Error Message")
 
         elif self.reply == "CHECKNAME":
-            #print "Name is not proper"
+            # print "Name is not proper"
             self.msg = QtGui.QErrorMessage(self)
             self.msg.showMessage(
                 'The project name should not contain space between them')
             self.msg.setWindowTitle("Error Message")
 
         elif self.reply == "NONE":
-            #print "Empty Project Name"
+            # print "Empty Project Name"
             self.msg = QtGui.QErrorMessage(self)
             self.msg.showMessage('The project name cannot be empty')
             self.msg.setWindowTitle("Error Message")
diff --git a/src/projManagement/openProject.py b/src/projManagement/openProject.py
index 58a6be0a..6cdcbb38 100644
--- a/src/projManagement/openProject.py
+++ b/src/projManagement/openProject.py
@@ -1,5 +1,5 @@
 
-#=========================================================================
+# =========================================================================
 #
 #          FILE: openProject.py
 #
@@ -15,7 +15,7 @@
 #  ORGANIZATION: eSim team at FOSSEE, IIT Bombay.
 #       CREATED: Wednesday 12 February 2015
 #      REVISION:  ---
-#=========================================================================
+# =========================================================================
 
 from PyQt4 import QtGui
 from .Validation import Validation
@@ -39,7 +39,7 @@ class OpenProjectInfo(QtGui.QWidget):
         self.projDir = QtGui.QFileDialog.getExistingDirectory(
             self, "open", self.openDir)
 
-        if self.obj_validation.validateOpenproj(self.projDir) == True:
+        if self.obj_validation.validateOpenproj(self.projDir):
             self.obj_Appconfig.current_project['ProjectName'] = str(
                 self.projDir)
             if os.path.isdir(self.projDir):
@@ -47,8 +47,10 @@ class OpenProjectInfo(QtGui.QWidget):
 
             for dirs, subdirs, filelist in os.walk(
                     self.obj_Appconfig.current_project["ProjectName"]):
-                directory = dirs
-                files = filelist
+                # directory = dirs
+                # files = filelist
+                # above 'directory' and 'files' variable never used
+                pass
             self.obj_Appconfig.project_explorer[dirs] = filelist
             json.dump(
                 self.obj_Appconfig.project_explorer, open(
@@ -59,9 +61,15 @@ class OpenProjectInfo(QtGui.QWidget):
 
         else:
             self.obj_Appconfig.print_error(
-                "The project doesn't contain .proj file. Please select the proper directory else you won't be able to perform any operation")
-            reply = QtGui.QMessageBox.critical(None, "Error Message", '''<b> Error: The project doesn't contain .proj file.</b><br/>
-                    <b>Please select the proper project directory else you won't be able to perform any operation</b>''', QtGui.QMessageBox.Ok | QtGui.QMessageBox.Cancel)
+                "The project doesn't contain .proj file. Please select the"
+                + "proper directory else you won't be able to perform any"
+                + "operation")
+            reply = QtGui.QMessageBox.critical(None, "Error Message",
+                                               '''<b>Error: The project doesn't contain .proj file.</b><br/>
+                <b>Please select the proper project directory else you won't
+                be able to perform any operation</b>''',
+                                               QtGui.QMessageBox.Ok |
+                                               QtGui.QMessageBox.Cancel)
 
             if reply == QtGui.QMessageBox.Ok:
                 self.body()