Changeset 574adc7 in sasview for src/sas/sascalc/file_converter

Timestamp:

Sep 22, 2017 4:01:32 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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

Children:

34d7b35

Parents:

9706d88

Message:

convert sascalc to python 2/3 syntax

Location:

src/sas/sascalc/file_converter

Files:

• cansas_writer.py (modified) (1 diff)
• nxcansas_writer.py (modified) (1 diff)

src/sas/sascalc/file_converter/cansas_writer.py

@@ -32 +32 @@
         valid_class = all([issubclass(data.__class__, Data1D) for data in frame_data])
         if not valid_class:
-            raise RuntimeError, ("The cansas writer expects an array of "
+            raise RuntimeError("The cansas writer expects an array of "
                 "Data1D instances")
 

src/sas/sascalc/file_converter/nxcansas_writer.py

@@ -166 +166 @@
             'wavelength_max': 'wavelength_max',
             'wavelength_spread': 'incident_wavelength_spread' }
-        for sasname, nxname in wavelength_keys.iteritems():
+        for sasname, nxname in wavelength_keys.items():
             value = getattr(data_info.source, sasname)
             units = getattr(data_info.source, sasname + '_unit')