Changeset 79ba1fc in sasview for sansmodels/src/python_wrapper/WrapperGenerator.py

Timestamp:

Apr 18, 2012 10:52:17 AM (12 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

3bd7cec

Parents:

d47c349

Message:

Fixing code style problems

File:

• sansmodels/src/python_wrapper/WrapperGenerator.py (modified) (4 diffs)

sansmodels/src/python_wrapper/WrapperGenerator.py

@@ -134 +134 @@
         key = "[FIXED]"
         try:
-            self.fixed= lineparser.readhelper(lines,key, key2,key3, file= self.file)
+            self.fixed= lineparser.readhelper(lines, key, 
+                                              key2, key3, file=self.file)
         except:
            raise   
@@ -140 +141 @@
         key = "[NON_FITTABLE_PARAMS]"
         try:
-            self.non_fittable= lineparser.readhelper(lines,key, key2,key3, file= self.file)
+            self.non_fittable= lineparser.readhelper(lines, key, key2,
+                                                     key3, file=self.file)
         except:
            raise   
@@ -147 +149 @@
         key = "[ORIENTATION_PARAMS]"    
         try:
-            self.orientation_params = lineparser.readhelper( lines,key, 
-                                                    key2,key3, file= self.file)
+            self.orientation_params = lineparser.readhelper(lines, key, 
+                                                    key2, key3, file=self.file)
         except:
            raise 
@@ -452 +454 @@
            
             # fixed list  details
-            newline = self.replaceToken(newline, 
-                                        "[FIXED]",str(self.fixed))
-            # non-fittable list  details
-            newline = self.replaceToken(newline, 
-                                        "[NON_FITTABLE_PARAMS]",str(self.non_fittable))
+            fixed_str = str(self.fixed)
+            fixed_str.replace(', ', '\n                      ')
+            newline = self.replaceToken(newline, "[FIXED]",fixed_str)
+            
+            # non-fittable list details
+            newline = self.replaceToken(newline, 
+                                        "[NON_FITTABLE_PARAMS]",
+                                        str(self.non_fittable))
+            
             ## parameters with orientation
-       
-            newline = self.replaceToken(newline, 
-                               "[ORIENTATION_PARAMS]",str(self.orientation_params))
+            oriented_str = str(self.orientation_params)
+            oriented_str.replace(', ', '\n                                  ')
+            newline = self.replaceToken(newline, 
+                               "[ORIENTATION_PARAMS]", oriented_str)
            
             # Write new line to the wrapper .c file