[diffoscope] 02/07: Drop unnecessary whitespace.
Chris Lamb
chris at chris-lamb.co.uk
Mon Aug 15 21:55:54 CEST 2016
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository diffoscope.
commit 3aa563354ccbd8dff61a3eecf6f1fbc66548d6f8
Author: Chris Lamb <lamby at debian.org>
Date: Mon Aug 15 19:47:42 2016 +0100
Drop unnecessary whitespace.
Signed-off-by: Chris Lamb <lamby at debian.org>
---
CONTRIBUTING | 2 +-
diffoscope/comparators/cbfs.py | 2 +-
diffoscope/comparators/git.py | 1 -
tests/comparators/test_mono.py | 4 ++--
tests/comparators/test_ppu.py | 4 ++--
tests/test_difference.py | 2 +-
6 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/CONTRIBUTING b/CONTRIBUTING
index 2171cbc..e2ddcb9 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -5,7 +5,7 @@ It's helpful to track fixes or new features via wishlist bugs against the
The code is available in the link:https://anonscm.debian.org/git/reproducible/diffoscope.git/tree/[diffoscope.git repository].
-Patches can be submitted as requests to pull from a publicly-visible
+Patches can be submitted as requests to pull from a publicly-visible
git repository (this is the prefered way) communicated via IRC or mail,
or completly via mail (using git format-patch, see below).
If appropriate, please make a topic branch based on the 'master' branch.
diff --git a/diffoscope/comparators/cbfs.py b/diffoscope/comparators/cbfs.py
index d20c3c1..a66d8b6 100644
--- a/diffoscope/comparators/cbfs.py
+++ b/diffoscope/comparators/cbfs.py
@@ -53,7 +53,7 @@ class CbfsContainer(Archive):
if line.startswith('Name'):
header = False
continue
- name = line.split()[0]
+ name = line.split()[0]
if name == '(empty)':
continue
yield name
diff --git a/diffoscope/comparators/git.py b/diffoscope/comparators/git.py
index d78282e..9c5e70b 100644
--- a/diffoscope/comparators/git.py
+++ b/diffoscope/comparators/git.py
@@ -100,4 +100,3 @@ Device ID: ({major}, {minor})
minor=os.minor(x['dev']),
hexsha=binascii.b2a_hex(x['sha']).decode('utf-8'),
)
-
diff --git a/tests/comparators/test_mono.py b/tests/comparators/test_mono.py
index 9d53a34..db2d6ad 100644
--- a/tests/comparators/test_mono.py
+++ b/tests/comparators/test_mono.py
@@ -32,8 +32,8 @@ from conftest import tool_missing
# echo 'public class Test { static public void Main () {} }' > test.cs
# mcs -out:test1.exe test.cs ; sleep 2; mcs -out:test2.exe test.cs
-TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/test1.exe')
-TEST_FILE2_PATH = os.path.join(os.path.dirname(__file__), '../data/test2.exe')
+TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/test1.exe')
+TEST_FILE2_PATH = os.path.join(os.path.dirname(__file__), '../data/test2.exe')
@pytest.fixture
def exe1():
diff --git a/tests/comparators/test_ppu.py b/tests/comparators/test_ppu.py
index 96be1a3..7149e33 100644
--- a/tests/comparators/test_ppu.py
+++ b/tests/comparators/test_ppu.py
@@ -34,8 +34,8 @@ from conftest import tool_missing
# castletexturefont_dejavusans_10.ppu which are generated during package
# building of the cge package from dejavusans font in the fonts-dejavu package.
-TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/test1.ppu')
-TEST_FILE2_PATH = os.path.join(os.path.dirname(__file__), '../data/test2.ppu')
+TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/test1.ppu')
+TEST_FILE2_PATH = os.path.join(os.path.dirname(__file__), '../data/test2.ppu')
@pytest.fixture
def file1():
diff --git a/tests/test_difference.py b/tests/test_difference.py
index 6a6cfa7..1c01cbf 100644
--- a/tests/test_difference.py
+++ b/tests/test_difference.py
@@ -29,7 +29,7 @@ def test_too_much_input_for_diff(monkeypatch):
too_long_text_a = io.StringIO("a\n" * 21)
too_long_text_b = io.StringIO("b\n" * 21)
difference = Difference.from_text_readers(too_long_text_a, too_long_text_b, 'a', 'b')
- assert '[ Too much input for diff ' in difference.unified_diff
+ assert '[ Too much input for diff ' in difference.unified_diff
def test_too_long_diff_block_lines(monkeypatch):
monkeypatch.setattr(Config, 'max_diff_block_lines', 10)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git
More information about the diffoscope
mailing list