PythonChecker updates

Author: tpaviot

src/generate_swig_files.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-##Copyright 2008-2011 Thomas Paviot (tpaviot@gmail.com)
+##Copyright 2008-2013 Thomas Paviot (tpaviot@gmail.com)
 ##
 ##This file is part of pythonOCC.
 ##
@@ -20,8 +20,8 @@
 import sys
 import os
 import glob
-# add the ./src directory to the sys.path list
-sys.path.append(os.path.join(os.getcwd(),'wrapper'))
+
+sys.path.append(os.path.join(os.getcwd(), 'wrapper'))
 import SWIG_generator
 import Modules
 import environment
@@ -37,80 +37,59 @@
     MULTI_PROCESS_GENERATION = False
 import time
 
+
 def check_paths():
     #
-    # Under WNT, modify Standard_Real.hxx so that it can be parsed by GCCXML without issue
+    # Under WNT, modify Standard_Real.hxx so that it can be parsed by
+    # GCCXML without issue
     #
     if sys.platform == 'win32':
-        standard_real_header = os.path.join(environment.OCC_INC,"Standard_Real.hxx")
+        standard_real_header = os.path.join(environment.OCC_INC, "Standard_Real.hxx")
         if not os.path.isfile(standard_real_header):
-            print "%s not found."%standard_real_header
+            print "%s not found." % standard_real_header
             sys.exit(0)
-       # else:
-        #    import shutil
-        #    fp = open(standard_real_header,"r")
-        #    file_content = fp.read()
-        #    fp.close()
-        #    if not '__SWIG_GENERATION__' in file_content:#need rewriting
-        #        key = raw_input("Original Standard_Real.hxx header file needs to be modified. Original file will be available with the name Standard_Real_Original.hxx.\nEnter 'y' or 'Y' if you whish to continue.'n' otherwise:")# first mode Standard_Real.hxx to Standard_Real_Original.hxx
-        #        if key.lower()=='y':
-        #            shutil.copy(standard_real_header, os.path.join(environment.OCC_INC,"Standard_Real_Original.hxx"))
-        #            #replacing string
-        #            file_content = file_content.replace("#if defined(WNT)","#if defined(WNT) && !defined(__SWIG_GENERATION__)")
-        #            fp = open(standard_real_header,"w")
-        #            fp.write(file_content)
-        #            fp.close()
-        #        else:
-        #            sys.exit(0)
-        #    else:
-        #        print "Found modified Standard_Real.hxx header file."
-    #
-    # Remove all files from OCC folder
-    #
-    #files_to_remove = glob.glob(os.path.join(os.getcwd(),'OCC','*'))
-    #for file_to_remove in files_to_remove:
-    #    os.remove(file_to_remove) 
     #
     # Create paths
     #
     if not os.path.isdir(environment.SWIG_FILES_PATH_MODULAR):
         os.mkdir(environment.SWIG_FILES_PATH_MODULAR)
 
+
 def generate_SWIG_file_for_module(module):
     ''' For each module, create the siwg .i file to be processed
     '''
     if module in Modules.SALOME_GEOM_MODULES:
-        SWIG_generator.ModularBuilder(module,environment.SALOME_GEOM_INC)
+        SWIG_generator.ModularBuilder(module, environment.SALOME_GEOM_INC)
     elif module in Modules.SALOME_SMESH_MODULES:
-        SWIG_generator.ModularBuilder(module,environment.SALOME_SMESH_INC)
+        SWIG_generator.ModularBuilder(module, environment.SALOME_SMESH_INC)
     else:
         SWIG_generator.ModularBuilder(module)
 
+
 def generate_swig_multiprocess(module_list):
     ''' Generate swig files with parallel support
     '''
-    #raw_input('Enter something')
     init_time = time.time()
     P = processing.Pool(nprocs)
-    P.map(generate_SWIG_file_for_module,module_list)
+    P.map(generate_SWIG_file_for_module, module_list)
     final_time = time.time()
-    #print "%i exported classes"%SWIG_generator.nb_exported_classes
     print final_time-init_time
 
+
 def generate_swig_single_process(module_list):
     ''' Generate swig files in single process mode (multiprocessing not found)
     '''
     init_time = time.time()
     for module in module_list:
         generate_SWIG_file_for_module(module)
     final_time = time.time()
-    print "%i exported classes"%SWIG_generator.nb_exported_classes
+    print "%i exported classes" % SWIG_generator.nb_exported_classes
     print final_time-init_time
 
 if __name__ == '__main__':
     check_paths()
     # Check if a module name is passed to the command line
-    if len(sys.argv)>1:
+    if len(sys.argv) > 1:
         module_name_to_wrap = sys.argv[1]
         if module_name_to_wrap == 'GEOM':
             print "Generating swig files for the GEOM library"
@@ -126,14 +105,13 @@ def generate_swig_single_process(module_list):
                     modules_to_wrap = [module]
                     break
         #print modules_to_wrap
-        if modules_to_wrap == None:
-            raise NameError,"Unknown module"
+        if modules_to_wrap is None:
+            raise NameError("Unknown module")
     else:
         if sys.platform == 'win32':
             modules_to_wrap = Modules.COMMON_MODULES + Modules.WIN_MODULES
         else:
             modules_to_wrap = Modules.COMMON_MODULES + Modules.UNIX_MODULES
-        
     if MULTI_PROCESS_GENERATION:
         print "Generating pythonOCC SWIG files (MultiProcess mode)."
         generate_swig_multiprocess(modules_to_wrap)