fix linter issues

Author: sim0nx

openhab/client.py

@@ -184,7 +184,7 @@ def req_post(self,
   def req_put(self,
               uri_path: str,
               data: typing.Optional[dict] = None,
-              json: typing.Optional[dict] = None,
+              json_data: typing.Optional[dict] = None,
               headers: typing.Optional[dict] = None
               ) -> None:
     """Helper method for initiating a HTTP PUT request.
@@ -195,7 +195,7 @@ def req_put(self,
     Args:
       uri_path (str): The path to be used in the PUT request.
       data (dict, optional): A optional dict with data to be submitted as part of the PUT request.
-      json: Data to be submitted as json.
+      json_data: Data to be submitted as json.
       headers: Specify optional custom headers.
 
     Returns:
@@ -204,7 +204,7 @@ def req_put(self,
     if headers is None:
       headers = {'Content-Type': 'text/plain'}
 
-    r = self.session.put(self.url_rest + uri_path, data=data, json=json, headers=headers, timeout=self.timeout)
+    r = self.session.put(self.url_rest + uri_path, data=data, json=json_data, headers=headers, timeout=self.timeout)
     self._check_req_return(r)
 
   # fetch all items
@@ -300,7 +300,7 @@ def get_item_raw(self, name: str) -> typing.Any:
     Returns:
       dict: A JSON decoded dict.
     """
-    return self.req_get('/items/{}'.format(name))
+    return self.req_get(f'/items/{name}')
 
   def logout(self) -> bool:
     """OAuth2 session logout method.
@@ -378,7 +378,7 @@ def create_or_update_item(self,
                      Can be one of ['EQUALITY', 'AND', 'OR', 'NAND', 'NOR', 'AVG', 'SUM', 'MAX', 'MIN', 'COUNT', 'LATEST', 'EARLIEST']
       function_params: Optional list of function params (no documentation found), depending on function name.
     """
-    paramdict: typing.Dict[str, typing.Union[str, typing.List[str], typing.Dict[str, typing.Union[str, typing.List]]]] = {}
+    paramdict: typing.Dict[str, typing.Union[str, typing.List[str], typing.Dict[str, typing.Union[str, typing.List[str]]]]] = {}
 
     if isinstance(_type, type):
       if issubclass(_type, openhab.items.Item):
@@ -427,14 +427,14 @@ def create_or_update_item(self,
       if function_name == 'COUNT' and (not function_params or len(function_params) != 1):
         raise ValueError(f'Group function "{function_name}" requires one arguments')
 
-      paramdict['function'] = {'name': function_name}
-
       if function_params:
-        paramdict['function']['params'] = function_params
+        paramdict['function'] = {'name': function_name, 'params': function_params}
+      else:
+        paramdict['function'] = {'name': function_name}
 
     self.logger.debug('About to create item with PUT request:\n%s', str(paramdict))
 
-    self.req_put(f'/items/{name}', json=paramdict, headers={'Content-Type': 'application/json'})
+    self.req_put(f'/items/{name}', json_data=paramdict, headers={'Content-Type': 'application/json'})
 
 
 # noinspection PyPep8Naming

openhab/command_types.py

@@ -253,7 +253,7 @@ def validate(cls, value: typing.Union[str, typing.Tuple[int, int, float]]) -> No
     strvalue = str(value)
     if isinstance(value, tuple):
       if len(value) == 3:
-        strvalue = "{},{},{}".format(value[0], value[1], value[2])
+        strvalue = f'{value[0]},{value[1]},{value[2]}'
         super().validate(strvalue)
         ColorType.parse(strvalue)
 

openhab/items.py

@@ -169,7 +169,7 @@ def _validate_value(self, value: typing.Union[str, typing.Type[openhab.command_t
           validation = True
 
       if not validation:
-        raise ValueError('Invalid value "{}"'.format(value))
+        raise ValueError(f'Invalid value "{value}"')
     else:
       raise ValueError()
 
@@ -282,8 +282,8 @@ class GroupItem(Item):
   """String item type."""
 
   TYPENAME = 'Group'
-  types = []
-  state_types = []
+  types: typing.List[typing.Type[openhab.command_types.CommandType]] = []
+  state_types: typing.List[typing.Type[openhab.command_types.CommandType]] = []
 
 
 class StringItem(Item):
@@ -456,9 +456,9 @@ def _parse_rest(self, value: str) -> typing.Tuple[typing.Union[float, None], str
       return float(value), ''
 
     except (ArithmeticError, ValueError) as exc:
-      self.logger.error('error in parsing new value "{}" for "{}"'.format(value, self.name), exc)
+      self.logger.error('Error in parsing new value "%s" for "%s" - "%s"', value, self.name, exc)
 
-    raise ValueError('{}: unable to parse value "{}"'.format(self.__class__, value))
+    raise ValueError(f'{self.__class__}: unable to parse value "{value}"')
 
   def _rest_format(self, value: float) -> str:  # type: ignore[override]
     """Format a value before submitting to openHAB.
@@ -484,7 +484,7 @@ def command(self, *args: typing.Any, **kwargs: typing.Any) -> None:
 
     Note: Commands are not accepted for items of type contact.
     """
-    raise ValueError('This item ({}) only supports updates, not commands!'.format(self.__class__))
+    raise ValueError(f'This item ({self.__class__}) only supports updates, not commands!')
 
   def open(self) -> None:
     """Set the state of the contact item to OPEN."""