Add more debugging in case of bad arg or env variables which can't be

decoded
twisted · Jun 20, 2020 · 3234199 · 3234199
1 parent 4c75dad
commit 3234199
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/src/twisted/internet/base.py b/src/twisted/internet/base.py
@@ -985,23 +985,28 @@ def argChecker(arg):
 
         outputArgs = []
         for arg in args:
-            arg = argChecker(arg)
-            if arg is None:
-                raise TypeError("Arguments contain a non-string value")
+            _arg = argChecker(arg)
+            if _arg is None:
+                raise TypeError(
+                    "Arguments contain a non-string value: {}".format(arg))
             else:
-                outputArgs.append(arg)
+                outputArgs.append(_arg)
 
         outputEnv = None
         if env is not None:
             outputEnv = {}
             for key, val in iteritems(env):
-                key = argChecker(key)
-                if key is None:
-                    raise TypeError("Environment contains a non-string key")
-                val = argChecker(val)
-                if val is None:
-                    raise TypeError("Environment contains a non-string value")
-                outputEnv[key] = val
+                _key = argChecker(key)
+                if _key is None:
+                    raise TypeError(
+                        "Environment contains a "
+                        "non-string key: {}".format(key))
+                _val = argChecker(val)
+                if _val is None:
+                    raise TypeError(
+                        "Environment contains a "
+                        "non-string value: {}".format(val))
+                outputEnv[_key] = _val
         return outputArgs, outputEnv
 
     # IReactorThreads