Changeset 8c9e65c in sasview for src/sas/sascalc/data_util/nxsunit.py

Timestamp:

Mar 5, 2019 1:52:24 PM (5 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

f205d3a, 1342f6a

Parents:

0a924c6 (diff), 4cbb2f5 (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@…> (03/05/19 13:52:24)

git-committer:

GitHub <noreply@…> (03/05/19 13:52:24)

Message:

py37 support for sascalc. Refs #888 an #1233.

File:

• src/sas/sascalc/data_util/nxsunit.py (modified) (1 diff)

src/sas/sascalc/data_util/nxsunit.py

@@ -99 +99 @@
     Strip '^' from unit names.
 
-    * WARNING * this will incorrect transform 10^3 to 103.
-    """
-    s.update((k.replace('^',''),v)
-             for k, v in list(s.items())
-             if '^' in k)
+    * WARNING * this will incorrectly transform 10^3 to 103.
+    """
+    stripped = [(k.replace('^',''),v) for k, v in s.items() if '^' in k]
+    s.update(stripped)
 
 def _build_all_units():