[Git][reproducible-builds/diffoscope][master] 2 commits: Strip trailing whitespace from ssconvert(1) output to support gnumeric 1.12.43.

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
255cbe59 by Chris Lamb at 2018-09-30T09:38:36Z
Strip trailing whitespace from ssconvert(1) output to support gnumeric 1.12.43.

- - - - -
3c4046e0 by Chris Lamb at 2018-09-30T09:38:42Z
Drop extra whitespace.

- - - - -


2 changed files:

- diffoscope/comparators/gnumeric.py
- tests/comparators/test_gnumeric.py


Changes:

=====================================
diffoscope/comparators/gnumeric.py
=====================================
@@ -61,4 +61,4 @@ class GnumericFile(File):
         ))
 
         with open(t.name) as f:
-            return f.read()
+            return f.read().strip()


=====================================
tests/comparators/test_gnumeric.py
=====================================
@@ -65,7 +65,6 @@ def test_diff_new(differences):
     assert differences[0].unified_diff == expected_diff
 
 
-
 @skip_unless_tools_exist('ssconvert')
 def test_compare_non_existing(monkeypatch, gnumeric1):
     assert_non_existing(monkeypatch, gnumeric1, has_null_source=False)



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/7f9f0acd4c2731762bcc66e5c1f7042797c89854...3c4046e0202e035fbb18b6136688becad41e25e8

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/7f9f0acd4c2731762bcc66e5c1f7042797c89854...3c4046e0202e035fbb18b6136688becad41e25e8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20180930/461e5089/attachment.html>