This avoids guarding them against NoneType everywhere
Signed-off-by: Alexander Kanavin <alex@...>
---
modules/errors.py | 2 +-
modules/utils/devtool.py | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/modules/errors.py b/modules/errors.py
index fa543f7..48e8b70 100644
--- a/modules/errors.py
+++ b/modules/errors.py
@@ -24,7 +24,7 @@
#
class Error(Exception):
- def __init__(self, message=None, stdout=None, stderr=None):
+ def __init__(self, message=None, stdout="", stderr=""):
self.message = message
self.stdout = stdout
self.stderr = stderr
diff --git a/modules/utils/devtool.py b/modules/utils/devtool.py
index e4e028f..c26061f 100644
--- a/modules/utils/devtool.py
+++ b/modules/utils/devtool.py
@@ -19,10 +19,7 @@ class Devtool(object):
raise DevtoolError("The following devtool command failed: " + operation,
e.stdout, e.stderr)
- if stderr is None:
- return stdout
- else:
- return stdout + stderr
+ return stdout + stderr
def upgrade(self, recipe, version = None, revision = None):
cmd = " upgrade " + recipe
--
2.30.2
