Removed Fstrings for RTD Support

thermoDataGrabber/thermoDataGrabber/thermoDataGrabber.py

@@ -23,9 +23,15 @@
 T = TypeVar("ThermoFluid")
 C = TypeVar("CSVFluid")
 
-UNITS = {"P":"Pa",
-"T":"K","S":"J/kg/K","G":"J/kg","U":"J/kg","D":"kg/m^3","V":"m^3"}
-
+UNITS = {
+    "P": "Pa",
+    "T": "K",
+    "S": "J/kg/K",
+    "G": "J/kg",
+    "U": "J/kg",
+    "D": "kg/m^3",
+    "V": "m^3"
+}
 
 
 class ThermoFluid():
@@ -158,7 +164,7 @@ def __init__(self,
         self.clean()
         self.make_meta()
 
-    def make_units(self)-> None:
+    def make_units(self) -> None:
         """(Re)make the units list"""
         self.units = [get(var, UNITS, "UnknownVar") for var in self.vars]
 
@@ -180,7 +186,6 @@ def make_meta(self) -> None:
             "units": self.units
         })
 
-
     def refresh(self) -> None:
         """
         Refreshes the object, remakes meta, cleans data, remakes units.
@@ -189,8 +194,7 @@ def refresh(self) -> None:
         self.clean()
         self.meta()
 
-
-    def add_column(self, variables: Union[List[Text], Text])-> None:
+    def add_column(self, variables: Union[List[Text], Text]) -> None:
         """
         Adds a column to the dataframe
 
@@ -201,17 +205,22 @@ def add_column(self, variables: Union[List[Text], Text])-> None:
             try:
                 assert var not in self.vars
             except AssertionError:
-                print(f"Cannot add column {var}: already in frame")
+                print("Cannot add column {0}: already in frame".format(var))
                 return None
             try:
                 assert var != "V"
             except AssertionError:
-                print(f"Cannot add Volume as a column just yet, TODO")
+                print("Cannot add Volume as a column just yet, TODO")
                 return None
 
         self.vars += variables
         buffer = dict([])
-        newcols = {var: (lambda state: CP.PropsSI(var, self.xvar, state[self.xvar], self.yvar, state[self.yvar], self.fluid)) for var in variables}
+        newcols = {
+            var:
+            (lambda state: CP.PropsSI(var, self.xvar, state[self.xvar], self.yvar, state[self.yvar], self.fluid)
+             )
+            for var in variables
+        }
         for key in newcols:
             buffer[key] = []
 
@@ -239,7 +248,6 @@ def clean(self) -> None:
         if "V" in self.vars:
             self.data = self.data[self.data["V"] >= 0.1]
 
-
     def write_data(self, path: str) -> None:
         """
         Does what it says on the tin. Makes a CSV and JSON files and saves them to data/FluidName_X-xpoints_Y-ypoints_Z.