Changeset c00a797a in sasview for test/sasdataloader

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:

test/sasdataloader

Files:

• plugins/test_reader.py (modified) (2 diffs)
• test/sequence_tests.py (modified) (4 diffs)
• test/utest_abs_reader.py (modified) (3 diffs)

test/sasdataloader/plugins/test_reader.py

@@ -8 +8 @@
 copyright 2008, University of Tennessee
 """
+from __future__ import print_function
+
 import os
 import numpy as np
@@ -59 +61 @@
     reader = Reader()
     output = reader.read("../test/test_data.test")
-    print output.x
+    print(output.x)
     
     

test/sasdataloader/test/sequence_tests.py

@@ +1 @@
+from __future__ import print_function
+
 from DataLoader.loader import Loader
 from DataLoader.readers.IgorReader import Reader as igor_reader
@@ -8 +10 @@
     out2 = Loader().load("MAR07232_rest.ASC")
     if len(out2.detector)>1:
-        print "Consecutive reads using Loader failed"
+        print("Consecutive reads using Loader failed")
 
 def consecutive_reader():
@@ -14 +16 @@
     out2 = igor_reader().read("MAR07232_rest.ASC")
     if len(out2.detector)>1:
-        print "Consecutive reads using Readers failed"
-        print out1
-        print out2
+        print("Consecutive reads using Readers failed")
+        print(out1)
+        print(out2)
 
 def single_abs():
@@ -29 +31 @@
     single_igor()
     single_abs()
-    print "Test passed"
+    print("Test passed")

test/sasdataloader/test/utest_abs_reader.py

@@ -2 +2 @@
     Unit tests for data manipulations
 """
+from __future__ import print_function
 
 import unittest
@@ -309 +310 @@
             self.assertTrue(item.date in ['04-Sep-2007 18:35:02',
                                           '03-SEP-2006 11:42:47'])
-            print item.term
+            print(item.term)
             for t in item.term:
                 if t['name']=="ABS:DSTAND" \
@@ -368 +369 @@
         
         self.assertEqual(self.data.meta_data['loader'], "CanSAS XML 1D")
-        print self.data.errors
+        print(self.data.errors)
         self.assertEqual(len(self.data.errors), 1)