[diffoscope] 04/04: comparators: utils: command: replaces .stderr_content by .stderr

[Juliana Oliveira]

This is an automated email from the git hooks/post-receive script.

jwnx-guest pushed a commit to branch jwnx_parallel_diffoscope
in repository diffoscope.

commit 2d469dff120825f36de3dad842283cf75b055613
Author: Juliana Oliveira <juliana.orod at gmail.com>
Date:   Thu Jan 25 14:12:03 2018 -0200

    comparators: utils: command: replaces .stderr_content by .stderr
    
    There is no need for two stderr properties.
    
    Signed-off-by: Juliana Oliveira <juliana.orod at gmail.com>
---
 diffoscope/comparators/utils/command.py | 4 ----
 diffoscope/difference.py                | 8 ++++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/diffoscope/comparators/utils/command.py b/diffoscope/comparators/utils/command.py
index e639df1..5c96a77 100644
--- a/diffoscope/comparators/utils/command.py
+++ b/diffoscope/comparators/utils/command.py
@@ -96,10 +96,6 @@ class Command(object, metaclass=abc.ABCMeta):
         return buf
 
     @property
-    def stderr_content(self):
-        return self.stderr
-
-    @property
     def returncode(self):
         return self._process.returncode
 
diff --git a/diffoscope/difference.py b/diffoscope/difference.py
index 526b81e..1b19b8c 100644
--- a/diffoscope/difference.py
+++ b/diffoscope/difference.py
@@ -293,16 +293,16 @@ class Difference(object):
         if not difference:
             return None, False
 
-        if command1 and command1.stderr_content:
+        if command1 and command1.stderr:
             difference.add_comment("stderr from `{}`:".format(
                 ' '.join(command1.cmdline()),
             ))
-            difference.add_comment(command1.stderr_content)
-        if command2 and command2.stderr_content:
+            difference.add_comment(command1.stderr)
+        if command2 and command2.stderr:
             difference.add_comment("stderr from `{}`:".format(
                 ' '.join(command2.cmdline()),
             ))
-            difference.add_comment(command2.stderr_content)
+            difference.add_comment(command2.stderr)
 
         return difference, False
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git