Changeset e090ba90 in sasview for src/sas/sascalc/dataloader/readers

Timestamp:

Oct 11, 2018 1:59:57 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1249

Children:

88d2e70

Parents:

67ed543

Message:

remove errors and warnings from py37 tests of sascalc

Location:

src/sas/sascalc/dataloader/readers

Files:

• associations.py (modified) (1 diff)
• cansas_reader.py (modified) (1 diff)
• cansas_reader_HDF5.py (modified) (1 diff)

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

@@ -53 +53 @@
                 exec("loader.associate_file_type('%s', %s)"
                      % (ext.upper(), reader))
-            except:
+            except Exception as exc:
                 msg = "read_associations: skipping association"
-                msg += " for %s\n  %s" % (ext.lower(), sys.exc_value)
+                msg += " for %s\n  %s" % (ext.lower(), exc)
                 logger.error(msg)

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

@@ -1239 +1239 @@
                         conv = Converter(units)
                         setattrchain(storage, variable, conv(value, units=local_unit))
-                    except Exception:
-                        _, exc_value, _ = sys.exc_info()
+                    except Exception as exc:
                         err_mess = "CanSAS reader: could not convert"
                         err_mess += " %s unit [%s]; expecting [%s]\n  %s" \
-                            % (variable, units, local_unit, exc_value)
+                            % (variable, units, local_unit, exc)
                         self.errors.add(err_mess)
                         if optional:

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

@@ -475 +475 @@
                 for i in range(0, dataset.mask.size - 1):
                     zeros[i] = dataset.mask[i]
-            except:
-                self.errors.add(sys.exc_value)
+            except Exception as exc:
+                self.errors.add(exc)
             dataset.mask = zeros
             # Calculate the actual Q matrix