Modifications in response to issue #52 to go back to original call si…

…gnatures for deprecated T_s, etc. function calls.

src/pyromat/registry/ig.py

@@ -1783,15 +1783,20 @@ def T_s(self,s,*varg, **kwarg):
     T = T_s(s)
         or
     T = T_s(s,p)
-        or
-    T = T_s(s,d)
 
 Accepts unit_energy / unit_matter / unit_temperature
         unit_pressure
         unit_matter / unit_volume
 Returns unit_temperature
 """
-        return self.T(*varg, s=s, **kwarg)
+        if len(varg) > 0:
+            if 'p' in kwarg:
+                raise pm.utility.PMParamError('p was specified both positionally and with a keyword.')
+            kwarg['p'] = varg[0]
+        if len(varg) > 1:
+            raise pm.utility.PMParamError('There are only two positional arguments: s, p.')
+
+        return self.T(s=s, **kwarg)
 
 
     def T_h(self,h,*varg,**kwarg):
@@ -1810,8 +1815,14 @@ def T_h(self,h,*varg,**kwarg):
         unit_pressure
 Returns unit_temperature
 """
-        # Convert the 
-        return self.T(*varg, h=h, **kwarg)
+        if len(varg) > 0:
+            if 'p' in kwarg:
+                raise pm.utility.PMParamError('p was specified both positionally and with a keyword.')
+            kwarg['p'] = varg[0]
+        if len(varg) > 1:
+            raise pm.utility.PMParamError('There are only two positional arguments: h, p.')
+
+        return self.T(h=h, **kwarg)
 
 
     def p_s(self,s,*varg, **kwarg):

src/pyromat/registry/ig2.py

@@ -1249,18 +1249,23 @@ def T_s(self,s,*varg, **kwarg):
         """Temperature as a function of entropy
 ** Depreciated - use T() **
         
-    T = T_s(s)
+   T = T_s(s)
         or
     T = T_s(s,p)
-        or
-    T = T_s(s,d)
 
 Accepts unit_energy / unit_matter / unit_temperature
         unit_pressure
         unit_matter / unit_volume
 Returns unit_temperature
 """
-        return self.T(*varg, s=s, **kwarg)
+        if len(varg) > 0:
+            if 'p' in kwarg:
+                raise pm.utility.PMParamError('p was specified both positionally and with a keyword.')
+            kwarg['p'] = varg[0]
+        if len(varg) > 1:
+            raise pm.utility.PMParamError('There are only two positional arguments: s, p.')
+
+        return self.T(s=s, **kwarg)
 
 
     def T_h(self,h,*varg,**kwarg):
@@ -1279,8 +1284,16 @@ def T_h(self,h,*varg,**kwarg):
         unit_pressure
 Returns unit_temperature
 """
-        # Convert the 
-        return self.T(*varg, h=h, **kwarg)
+        if len(varg) > 0:
+            if 'p' in kwarg:
+                raise pm.utility.PMParamError(
+                    'p was specified both positionally and with a keyword.')
+            kwarg['p'] = varg[0]
+        if len(varg) > 1:
+            raise pm.utility.PMParamError(
+                'There are only two positional arguments: h, p.')
+
+        return self.T(h=h, **kwarg)
 
 
     def p_s(self,s,*varg, **kwarg):

src/pyromat/registry/igmix.py

@@ -1038,15 +1038,20 @@ def T_s(self,s,*varg,**kwarg):
     T = T_s(s)
         or
     T = T_s(s,p)
-        or
-    T = T_s(s,d)
 
 Accepts unit_energy / unit_matter / unit_temperature
         unit_pressure
         unit_matter / unit_volume
 Returns unit_temperature
 """
-        return self.T(s=s, *varg, **kwarg)
+        if len(varg) > 0:
+            if 'p' in kwarg:
+                raise pm.utility.PMParamError('p was specified both positionally and with a keyword.')
+            kwarg['p'] = varg[0]
+        if len(varg) > 1:
+            raise pm.utility.PMParamError('There are only two positional arguments: s, p.')
+
+        return self.T(s=s, **kwarg)
 
 
     def T_h(self,h, *varg, **kwarg):
@@ -1062,7 +1067,15 @@ def T_h(self,h, *varg, **kwarg):
         unit_pressure
 Returns unit_temperature
 """
-        return self.T(h=h, *varg, **kwarg)
+        if len(varg) > 0:
+            if 'p' in kwarg:
+                raise pm.utility.PMParamError(
+                    'p was specified both positionally and with a keyword.')
+            kwarg['p'] = varg[0]
+        if len(varg) > 1:
+            raise pm.utility.PMParamError('There are only two positional arguments: h, p.')
+
+        return self.T(h=h, **kwarg)
 
 
     def p_s(self, s, *varg, **kwarg):

src/pyromat/registry/mp1.py

@@ -4154,7 +4154,14 @@ def T_s(self, s, *varg, quality=False, **kwarg):
 
     T,x = T_s(s, p=p, quality=True)
 """
-        T,_,_,x,_ = self._argparse(*varg, s=s, **kwarg)
+        if len(varg) > 0:
+            if 'p' in kwarg:
+                raise pm.utility.PMParamError('p was specified both positionally and with a keyword.')
+            kwarg['p'] = varg[0]
+        if len(varg) > 1:
+            raise pm.utility.PMParamError('There are only two positional arguments: s, p.')
+
+        T,_,_,x,_ = self._argparse(s=s, **kwarg)
         if quality:
             return T,x
         return T
@@ -4198,7 +4205,14 @@ def T_h(self, h, *varg, quality=False, **kwarg):
 
     T,x = T_s(s, p=p, quality=True)
 """
-        T,_,_,x,_ = self._argparse(*varg, h=h, **kwarg)
+        if len(varg) > 0:
+            if 'p' in kwarg:
+                raise pm.utility.PMParamError('p was specified both positionally and with a keyword.')
+            kwarg['p'] = varg[0]
+        if len(varg) > 1:
+            raise pm.utility.PMParamError('There are only two positional arguments: h, p.')
+
+        T,_,_,x,_ = self._argparse(h=h, **kwarg)
 
         if quality:
             return T,x