apply suggested converter method

also disable mypy checks for int/string env conversion tests

Author: andre-merzky

src/psij/job_spec.py

@@ -21,6 +21,18 @@ def _to_path(arg: Union[str, pathlib.Path, None]) -> Optional[pathlib.Path]:
         return pathlib.Path(arg)
 
 
+def _to_env_dict(arg: Union[Dict[str, Union[str, int]], None]) -> Dict[str, str]:
+    if arg is None:
+        return dict()
+    ret = dict()
+    for k,v in arg.items():
+        if isinstance(v, int):
+            ret[k] = str(v)
+        else:
+            ret[k] = v
+    return ret
+
+
 class JobSpec(object):
     """A class that describes the details of a job."""
 
@@ -125,7 +137,7 @@ def __init__(self, executable: Optional[str] = None, arguments: Optional[List[st
         # care of the conversion, but mypy gets confused
         self._directory = _to_path(directory)
         self.inherit_environment = inherit_environment
-        self.environment = environment
+        self.environment = _to_env_dict(environment)
         self._stdin_path = _to_path(stdin_path)
         self._stdout_path = _to_path(stdout_path)
         self._stderr_path = _to_path(stderr_path)
@@ -160,15 +172,7 @@ def environment(self) -> Optional[Dict[str, str]]:
     @environment.setter
     def environment(self, env: Optional[Dict[str, Union[str, int]]]) -> None:
         """Ensure env dict values to be string typed."""
-        self._environment = None
-
-        if env:
-            self._environment = {}
-            for k, v in env.items():
-                if isinstance(v, int):
-                    self._environment[k] = str(v)
-                else:
-                    self._environment[k] = v
+        self._environment = _to_env_dict(env)
 
     @property
     def directory(self) -> Optional[pathlib.Path]:

tests/test_executor.py

@@ -126,7 +126,7 @@ def test_env_var(execparams: ExecutorTestParams) -> None:
                           arguments=['-c', 'env > /tmp/t; echo -n $TEST_VAR$TEST_INT'],
                           stdout_path=outp))
         assert job.spec is not None
-        job.spec.environment = {'TEST_INT': 1, 'TEST_VAR': '_y_'}
+        job.spec.environment = {'TEST_INT': 1, 'TEST_VAR': '_y_'}  # type: ignore
         ex = _get_executor_instance(execparams, job)
         ex.submit(job)
         status = job.wait(timeout=_get_timeout(execparams))

tests/test_job_spec.py

@@ -32,7 +32,7 @@ def test_environment_types() -> None:
     spec.environment = {'foo': 'bar'}
     assert spec.environment['foo'] == 'bar'
 
-    spec.environment = {'foo': 'biz', 'bar': 42}
+    spec.environment = {'foo': 'biz', 'bar': 42}  # type: ignore
     assert spec.environment['foo'] == 'biz'
     assert spec.environment['bar'] == '42'