Changeset cee5c78 in sasview for src/sas/qtgui/Plotting/ConvertUnits.py

Timestamp:

Nov 9, 2017 8:41:55 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

7fb471d

Parents:

b3e8629

git-author:

Piotr Rozyczko <rozyczko@…> (10/27/17 03:42:57)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 08:41:55)

Message:

Converted more syntax not covered by 2to3

File:

• src/sas/qtgui/Plotting/ConvertUnits.py (modified) (3 diffs, 1 prop)

src/sas/qtgui/Plotting/ConvertUnits.py

@@ -4 +4 @@
 """
 import re
-import string
 
 def convertUnit(power, unit):
@@ -11 +10 @@
     """
     if power != 0:
-        if string.find(unit, "^") != -1:  # if the unit contains a powerer ^
+        if unit.find("^") != -1:  # if the unit contains a powerer ^
             toks = re.split("\^", unit)
-            if string.find(toks[0], "/") != -1 or \
-                string.find(toks[0], "-") != -1:
+            if toks[0].find("/") != -1 or \
+                toks[0].find("-") != -1:
                 if power == 1:
                     unit = unit
@@ -20 +19 @@
                     unit = "(" + unit + ")" + "^{" + str(power) + "}"
             else:
-                if string.find(toks[1], "{") != -1:  # if found a {
+                if toks[1].find("{") != -1:  # if found a {
                     find_power_toks = re.split("{", toks[1])
-                    if string.find(find_power_toks[1], "}") != -1:  # found }
+                    if find_power_toks[1].find("}") != -1:  # found }
                         unit_toks = re.split("}", find_power_toks[1])
-                        if string.find(unit_toks[0], ".") != -1:
+                        if unit_toks[0].find(".") != -1:
                             powerer = float(unit_toks[0]) * power
-                        elif string.find(unit_toks[0], "/") != -1:
+                        elif unit_toks[0].find("/") != -1:
                             power_toks = re.split("/", unit_toks[0])
                             powerer = power * int(power_toks[0])\