[diffoscope] 02/04: diffoscope/comparators: Import format_symlink.

Chris Lamb chris at chris-lamb.co.uk
Tue Dec 27 18:16:45 CET 2016


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

lamby pushed a commit to branch master
in repository diffoscope.

commit 64efa9dace4fa809f1f39d0f20fdae954898c7fd
Author: Chris Lamb <lamby at debian.org>
Date:   Tue Dec 27 17:13:29 2016 +0000

    diffoscope/comparators: Import format_symlink.
---
 diffoscope/comparators/symlink.py        | 3 +--
 diffoscope/comparators/utils/__init__.py | 7 -------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/diffoscope/comparators/symlink.py b/diffoscope/comparators/symlink.py
index 984c925..f7c4784 100644
--- a/diffoscope/comparators/symlink.py
+++ b/diffoscope/comparators/symlink.py
@@ -23,7 +23,6 @@ from diffoscope import logger, get_named_temporary_file
 from diffoscope.difference import Difference
 
 from .binary import File
-from .utils import format_symlink
 
 
 class Symlink(File):
@@ -37,7 +36,7 @@ class Symlink(File):
 
     def create_placeholder(self):
         with get_named_temporary_file('w+', delete=False) as f:
-            f.write(format_symlink(self.symlink_destination))
+            f.write('destination: %s\n' % self.symlink_destination)
             f.flush()
             return f.name
 
diff --git a/diffoscope/comparators/utils/__init__.py b/diffoscope/comparators/utils/__init__.py
index ef87331..a026889 100644
--- a/diffoscope/comparators/utils/__init__.py
+++ b/diffoscope/comparators/utils/__init__.py
@@ -122,13 +122,6 @@ class Command(object, metaclass=abc.ABCMeta):
         return self._process.stdout
 
 
-
-
-def format_symlink(destination):
-    return 'destination: %s\n' % destination
-
-
-
 def get_compressed_content_name(path, expected_extension):
     basename = os.path.basename(path)
     if basename.endswith(expected_extension):

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


More information about the diffoscope mailing list