fix some pylint errors/warnings

Author: soxofaan

openeo/rest/auth/cli.py

@@ -193,8 +193,7 @@ def _interactive_choice(title: str, options: List[Tuple[str, str]], attempts=10)
             return options[int(entered) - 1][0]
         except Exception:
             pass
-    else:
-        raise CliToolException("Failed to pick valid option.")
+    raise CliToolException("Failed to pick valid option.")
 
 
 def show_warning(message: str):

openeo/rest/auth/config.py

@@ -88,6 +88,7 @@ def get(self, *keys, default=None) -> Union[dict, str, int]:
         """Load JSON file and do deep get with given keys."""
         result = deep_get(self.load(), *keys, default=default)
         if isinstance(result, Exception) or (isinstance(result, type) and issubclass(result, Exception)):
+            # pylint: disable=raising-bad-type
             raise result
         return result
 

openeo/rest/auth/oidc.py

@@ -197,6 +197,7 @@ def _decode(data: str) -> dict:
 
 class OidcProviderInfo:
     """OpenID Connect Provider information, as provided by an openEO back-end (endpoint `/credentials/oidc`)"""
+
     def __init__(self, issuer: str = None, discovery_url: str = None, scopes: List[str] = None):
         if issuer is None and discovery_url is None:
             raise ValueError("At least `issuer` or `discovery_url` should be specified")
@@ -242,13 +243,17 @@ def __init__(self, client_info: OidcClientInfo):
         # TODO: check provider config (e.g. if grant type is supported)
 
     @property
-    def client_id(self):
+    def client_id(self) -> str:
         return self._client_info.client_id
 
     @property
-    def client_secret(self):
+    def client_secret(self) -> str:
         return self._client_info.client_secret
 
+    @property
+    def provider_info(self) -> OidcProviderInfo:
+        return self._client_info.provider
+
     def get_tokens(self) -> AccessTokenResult:
         """Get access_token and possibly id_token+refresh_token."""
         result = self._do_token_post_request(post_data=self._get_token_endpoint_post_data())
@@ -602,4 +607,3 @@ def get_tokens(self) -> AccessTokenResult:
         raise OidcException("Timeout exceeded {m:.1f}s while polling for access token at {u!r}".format(
             u=token_endpoint, m=self._max_poll_time
         ))
-

openeo/rest/connection.py

@@ -350,7 +350,7 @@ def _authenticate_oidc(
         _log.info("Obtained tokens: {t}".format(t=[k for k, v in tokens._asdict().items() if v]))
         if tokens.refresh_token and store_refresh_token:
             self._refresh_token_store.set_refresh_token(
-                issuer=authenticator._client_info.provider.issuer,
+                issuer=authenticator.provider_info.issuer,
                 client_id=authenticator.client_id,
                 refresh_token=tokens.refresh_token
             )

openeo/util.py

@@ -114,7 +114,7 @@ def normalize(self, x: Any, *args) -> Union[str, None]:
             return None
         raise ValueError(x)
 
-    def parse_datetime(self, x: Union[str, None]) -> datetime:
+    def parse_datetime(self, x: Union[str, None]) -> dt.datetime:
         if isinstance(x, str):
             return dt.datetime.strptime(x, '%Y-%m-%dT%H:%M:%SZ')
         elif x is None and self._propagate_none:

openeo/vectorcube.py

@@ -56,16 +56,6 @@ def process(self, process_id: str, args: dict = None, metadata: CollectionMetada
             arguments=args, **kwargs
         ), metadata=metadata)
 
-    def process(self,pg:PGNode) -> 'VectorCube':
-        """
-        Generic helper to create a new DataCube by applying a process.
-
-        :param pg: A process graph node, constructed using other helpers.
-        :return: new DataCube instance
-        """
-        return self.process_with_node(pg)
-
-
     def process_with_node(self, pg: PGNode, metadata: CollectionMetadata = None) -> 'VectorCube':
         """
         Generic helper to create a new DataCube by applying a process (given as process graph node)

tests/rest/datacube/test_vectorcube.py

@@ -3,10 +3,11 @@
 from openeo.rest.connection import Connection
 import openeo
 
+
 def test_raster_to_vector(con100):
     img = con100.load_collection("S2")
     vector_cube = img.raster_to_vector()
-    vector_cube_tranformed = vector_cube.process(openeo.UDF("python source code","Python"))
+    vector_cube_tranformed = vector_cube.process_with_node(openeo.UDF("python source code", "Python"))
 
     assert vector_cube_tranformed.graph == {
         'loadcollection1': {
@@ -26,9 +27,9 @@ def test_raster_to_vector(con100):
         'runudf1': {
             'arguments': {
                 'data': {'from_node': 'rastertovector1'},
-                           'runtime': 'Python',
-                           'udf': 'python source code'
-                          },
-             'process_id': 'run_udf',
-             'result': True}
-    }
+                'runtime': 'Python',
+                'udf': 'python source code'
+            },
+            'process_id': 'run_udf',
+            'result': True}
+    }