Changeset a1b8fee in sasview for src/sas/sascalc

Timestamp:

Apr 30, 2017 10:26:11 PM (8 years ago)

Author:

andyfaff

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

aaf5e49

Parents:

9c3d784

Message:

MAINT: from future import print_function

Location:

src/sas/sascalc

Files:

• calculator/sas_gen.py (modified) (1 diff)
• data_util/calcthread.py (modified) (1 diff)
• data_util/formatnum.py (modified) (1 diff)
• data_util/registry.py (modified) (1 diff)
• dataloader/data_info.py (modified) (1 diff)
• dataloader/readers/IgorReader.py (modified) (1 diff)
• dataloader/readers/associations.py (modified) (1 diff)
• dataloader/readers/red2d_reader.py (modified) (1 diff)
• fit/AbstractFitEngine.py (modified) (1 diff)
• fit/Loader.py (modified) (1 diff)
• fit/expression.py (modified) (1 diff)
• pr/fit/AbstractFitEngine.py (modified) (1 diff)
• pr/fit/Loader.py (modified) (1 diff)
• pr/fit/expression.py (modified) (1 diff)
• pr/num_term.py (modified) (1 diff)
• simulation/analmodelpy/tests/testanal_model.py (modified) (1 diff)
• simulation/geoshapespy/tests/testshapes.py (modified) (1 diff)
• simulation/iqPy/tests/signon.py (modified) (1 diff)
• simulation/pointsmodelpy/tests/signon.py (modified) (1 diff)
• simulation/pointsmodelpy/tests/test2dui.py (modified) (1 diff)
• simulation/pointsmodelpy/tests/testcomplexmodel.py (modified) (1 diff)
• simulation/pointsmodelpy/tests/testlores.py (modified) (1 diff)
• simulation/pointsmodelpy/tests/testlores2d.py (modified) (1 diff)

src/sas/sascalc/calculator/sas_gen.py

@@ -3 +3 @@
 SAS generic computation and sld file readers
 """
+from __future__ import print_function
+
 import sas.sascalc.calculator.core.sld2i as mod
 from sas.sascalc.calculator.BaseComponent import BaseComponent

src/sas/sascalc/data_util/calcthread.py

@@ -4 +4 @@
 #  \brief Abstract class for defining calculation threads.
 #
+from __future__ import print_function
 
 import thread

src/sas/sascalc/data_util/formatnum.py

@@ -37 +37 @@
 formatter.compact flag.
 """
-from __future__ import division
+from __future__ import division, print_function
 
 import math

src/sas/sascalc/data_util/registry.py

@@ -6 +6 @@
 and registers the built-in file extensions.
 """
+from __future__ import print_function
 
 import os.path

src/sas/sascalc/dataloader/data_info.py

@@ -16 +16 @@
 ######################################################################
 
+from __future__ import print_function
 
 #TODO: Keep track of data manipulation in the 'process' data structure.

src/sas/sascalc/dataloader/readers/IgorReader.py

@@ -12 +12 @@
 #copyright 2008, University of Tennessee
 #############################################################################
+from __future__ import print_function
+
 import os
 

src/sas/sascalc/dataloader/readers/associations.py

@@ -14 +14 @@
 #copyright 2009, University of Tennessee
 #############################################################################
+from __future__ import print_function
+
 import os
 import sys

src/sas/sascalc/dataloader/readers/red2d_reader.py

@@ -9 +9 @@
 #copyright 2008, University of Tennessee
 ######################################################################
+from __future__ import print_function
+
 import os
 import numpy as np

src/sas/sascalc/fit/AbstractFitEngine.py

@@ +1 @@
+from __future__ import print_function
 
 import  copy

src/sas/sascalc/fit/Loader.py

@@ +1 @@
+from __future__ import print_function
+
 # class Loader  to load any king of file
 #import wx

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/pr/fit/AbstractFitEngine.py

@@ +1 @@
+from __future__ import print_function
 
 import  copy

src/sas/sascalc/pr/fit/Loader.py

@@ +1 @@
+from __future__ import print_function
+
 # class Loader  to load any king of file
 #import wx

src/sas/sascalc/pr/fit/expression.py

@@ +1 @@
+from __future__ import print_function
+
 # This program is public domain
 """

src/sas/sascalc/pr/num_term.py

@@ +1 @@
+from __future__ import print_function
+
 import math
 import numpy as np

src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py

@@ -11 +11 @@
 #  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # 
+from __future__ import print_function
+
 
 if __name__ == "__main__":

src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py

@@ -11 +11 @@
 #  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # 
+from __future__ import print_function
+
 
 if __name__ == "__main__":

src/sas/sascalc/simulation/iqPy/tests/signon.py

@@ -11 +11 @@
 #  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # 
+from __future__ import print_function
+
 
 if __name__ == "__main__":

src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py

@@ -11 +11 @@
 #  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # 
+from __future__ import print_function
+
 
 if __name__ == "__main__":

src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py

@@ -7 +7 @@
 #  Imports:
 #--------------------------------------------------------------------------------
+from __future__ import print_function
 
 import wx

src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py

@@ +1 @@
+from __future__ import print_function
+
 from sasModeling.pointsmodelpy import pointsmodelpy
 from sasModeling.iqPy import iqPy
 from sasModeling.geoshapespy import geoshapespy
+
 
 #First testing: a normal case, a lores model holds a sphere

src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py

@@ +1 @@
+from __future__ import print_function
+
+
 if __name__ == "__main__":
 

src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py

@@ +1 @@
+from __future__ import print_function
+
+
 def test_lores2d(phi):
   from sasModeling.pointsmodelpy import pointsmodelpy