Changeset c00a797a in sasview for src/sas/sascalc/dataloader

Timestamp:

May 1, 2017 10:23:44 AM (8 years ago)

Author:

GitHub <noreply@…>

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:

658dd57, c551bb3, 0cc77d8

Parents:

b636dfc5 (diff), aaf5e49 (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 10:23:44)

git-committer:

GitHub <noreply@…> (05/01/17 10:23:44)

Message:

Merge pull request #68 from andyfaff/print

MAINT: print statement to print function

Location:

src/sas/sascalc/dataloader

Files:

• data_info.py (modified) (1 diff)
• readers/IgorReader.py (modified) (1 diff)
• readers/associations.py (modified) (2 diffs)
• readers/red2d_reader.py (modified) (2 diffs)

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
@@ -71 +73 @@
                     logger.error(msg)
     else:
-        print "Could not find reader association settings\n  %s [%s]" % (__file__, os.getcwd())
+        print("Could not find reader association settings\n  %s [%s]" % (__file__, os.getcwd()))
          
          

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
@@ -82 +84 @@
         detector = Detector()
         if len(output.detector) > 0:
-            print str(output.detector[0])
+            print(str(output.detector[0]))
         output.detector.append(detector)