Changeset 0cc77d8 in sasview for src/sas/sascalc/fit

Timestamp:

May 1, 2017 5:00:53 PM (8 years ago)

Author:

GitHub <noreply@…>

Children:

733cdcd

Parents:

b9d74f3 (diff), c00a797a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Kienzle <pkienzle@…> (05/01/17 17:00:53)

git-committer:

GitHub <noreply@…> (05/01/17 17:00:53)

Message:

Merge branch 'master' into raise

Location:

src/sas/sascalc/fit

Files:

• AbstractFitEngine.py (modified) (2 diffs)
• Loader.py (modified) (3 diffs)
• expression.py (modified) (1 diff)
• MultiplicationModel.py (modified) (1 diff)
• pluginmodel.py (modified) (2 diffs)

src/sas/sascalc/fit/AbstractFitEngine.py

@@ +1 @@
+from __future__ import print_function
 
 import  copy
@@ -627 +628 @@
         """
         """
-        print str(self)
+        print(str(self))

src/sas/sascalc/fit/Loader.py

@@ +1 @@
+from __future__ import print_function
+
 # class Loader  to load any king of file
 #import wx
@@ -54 +56 @@
                     self.dx = np.zeros(len(self.x))
                 except:
-                    print "READ ERROR", line
+                    print("READ ERROR", line)
             # Sanity check
             if not len(self.x) == len(self.dx):
@@ -80 +82 @@
     load = Load()
     load.set_filename("testdata_line.txt")
-    print load.get_filename() 
+    print(load.get_filename()) 
     load.set_values()
-    print load.get_values()
+    print(load.get_values())
     
             

src/sas/sascalc/fit/expression.py

@@ -43 +43 @@
 Ideally, this interface will change
 """
+from __future__ import print_function
+
 import math
 import re

src/sas/sascalc/fit/MultiplicationModel.py

@@ -245 +245 @@
                     return
 
-        raise ValueError, "Model does not contain parameter %s" % name
+        raise ValueError("Model does not contain parameter %s" % name)
 
 

src/sas/sascalc/fit/pluginmodel.py

@@ -35 +35 @@
             return self.function(x_val)*self.function(y_val)
         elif x.__class__.__name__ == 'tuple':
-            raise ValueError, "Tuples are not allowed as input to BaseComponent models"
+            raise ValueError("Tuples are not allowed as input to BaseComponent models")
         else:
             return self.function(x)
@@ -52 +52 @@
             return self.function(x[0])*self.function(x[1])
         elif x.__class__.__name__ == 'tuple':
-            raise ValueError, "Tuples are not allowed as input to BaseComponent models"
+            raise ValueError("Tuples are not allowed as input to BaseComponent models")
         else:
             return self.function(x)