Changeset 9404dd3 in sasmodels for sasmodels/model_test.py

Timestamp:

Dec 4, 2015 12:41:47 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

eaca9eb

Parents:

7bb290c

Message:

python 3.x support

File:

• sasmodels/model_test.py (modified) (6 diffs)

sasmodels/model_test.py

@@ -68 +68 @@
         model_definition = load_model_definition(model_name)
 
-        #print '------'
-        #print 'found tests in', model_name
-        #print '------'
+        #print('------')
+        #print('found tests in', model_name)
+        #print('------')
 
         # if ispy then use the dll loader to call pykernel
@@ -93 +93 @@
                                      test_method_name,
                                      platform="ocl", dtype='single')
-                #print "defining", test_name
+                #print("defining", test_name)
                 suite.addTest(test)
 
@@ -144 +144 @@
                     pass
 
-            except Exception,exc:
+            except Exception as exc:
                 annotate_exception(exc, self.test_name)
                 raise
@@ -201 +201 @@
     if models and models[0] == 'opencl':
         if not HAVE_OPENCL:
-            print >>sys.stderr, "opencl is not available"
+            print("opencl is not available")
             return 1
         loaders = ['opencl']
@@ -215 +215 @@
         loaders = ['opencl', 'dll']
     if not models:
-        print >>sys.stderr, """\
+        print("""\
 usage:
   python -m sasmodels.model_test [opencl|dll|opencl_and_dll] model1 model2 ...
@@ -221 +221 @@
 If model1 is 'all', then all except the remaining models will be tested.
 If no compute target is specified, then models will be tested with both opencl
-and dll; the compute target is ignored for pure python models."""
+and dll; the compute target is ignored for pure python models.""")
 
         return 1