[Reproducible-commits] [diffoscope] 01/04: Rename to diffoscope
Jérémy Bobbio
lunar at moszumanska.debian.org
Mon Aug 3 13:57:06 UTC 2015
This is an automated email from the git hooks/post-receive script.
lunar pushed a commit to branch master
in repository diffoscope.
commit 98ff014ef1ce575eb31f9aec5afbc999f8fd797f
Author: Jérémy Bobbio <lunar at debian.org>
Date: Mon Aug 3 12:49:05 2015 +0000
Rename to diffoscope
debbindiff has grown way beyond a being just a tool to compare Debian packages.
Let's rename it to better reflect this state of things.
Kudos to Jocelyn Delalande for the name “diffoscope”!
We introduce a new transitional binary package to keep too many things to
break.
---
.gitignore | 2 +-
README | 38 ++++++++-----
debian/README.source | 4 +-
debian/control | 39 ++++++++-----
debian/copyright | 42 +++++++-------
debian/debbindiff.links | 2 +
debian/debbindiff.manpages | 1 -
debian/{debbindiff.1.rst => diffoscope.1.rst} | 24 ++++----
debian/{debbindiff.docs => diffoscope.docs} | 0
debian/diffoscope.manpages | 1 +
debian/rules | 16 +++---
debian/tests/control | 2 +-
debbindiff.py => diffoscope.py | 22 ++++----
{debbindiff => diffoscope}/__init__.py | 10 ++--
{debbindiff => diffoscope}/changes.py | 2 +-
{debbindiff => diffoscope}/comparators/__init__.py | 66 +++++++++++-----------
{debbindiff => diffoscope}/comparators/binary.py | 12 ++--
{debbindiff => diffoscope}/comparators/bzip2.py | 18 +++---
{debbindiff => diffoscope}/comparators/cpio.py | 20 +++----
{debbindiff => diffoscope}/comparators/deb.py | 20 +++----
{debbindiff => diffoscope}/comparators/debian.py | 22 ++++----
{debbindiff => diffoscope}/comparators/device.py | 18 +++---
.../comparators/directory.py | 20 +++----
{debbindiff => diffoscope}/comparators/elf.py | 16 +++---
{debbindiff => diffoscope}/comparators/fonts.py | 16 +++---
{debbindiff => diffoscope}/comparators/gettext.py | 18 +++---
{debbindiff => diffoscope}/comparators/gzip.py | 22 ++++----
{debbindiff => diffoscope}/comparators/haskell.py | 18 +++---
{debbindiff => diffoscope}/comparators/ipk.py | 12 ++--
{debbindiff => diffoscope}/comparators/iso9660.py | 20 +++----
{debbindiff => diffoscope}/comparators/java.py | 16 +++---
.../comparators/libarchive.py | 18 +++---
{debbindiff => diffoscope}/comparators/mono.py | 16 +++---
{debbindiff => diffoscope}/comparators/pdf.py | 16 +++---
{debbindiff => diffoscope}/comparators/png.py | 16 +++---
{debbindiff => diffoscope}/comparators/rpm.py | 20 +++----
.../comparators/rpm_fallback.py | 10 ++--
{debbindiff => diffoscope}/comparators/sqlite.py | 16 +++---
{debbindiff => diffoscope}/comparators/squashfs.py | 28 ++++-----
{debbindiff => diffoscope}/comparators/symlink.py | 18 +++---
{debbindiff => diffoscope}/comparators/tar.py | 24 ++++----
{debbindiff => diffoscope}/comparators/text.py | 14 ++---
{debbindiff => diffoscope}/comparators/utils.py | 24 ++++----
{debbindiff => diffoscope}/comparators/xz.py | 20 +++----
{debbindiff => diffoscope}/comparators/zip.py | 22 ++++----
{debbindiff => diffoscope}/difference.py | 12 ++--
{debbindiff => diffoscope}/presenters/__init__.py | 0
{debbindiff => diffoscope}/presenters/html.py | 16 +++---
{debbindiff => diffoscope}/presenters/text.py | 10 ++--
setup.py | 8 +--
tests/comparators/conftest.py | 12 ++--
tests/comparators/test_binary.py | 22 ++++----
tests/comparators/test_bzip2.py | 14 ++---
tests/comparators/test_cpio.py | 14 ++---
tests/comparators/test_deb.py | 20 +++----
tests/comparators/test_debian.py | 16 +++---
tests/comparators/test_directory.py | 14 ++---
tests/comparators/test_elf.py | 14 ++---
tests/comparators/test_fonts.py | 14 ++---
tests/comparators/test_gettext.py | 14 ++---
tests/comparators/test_gzip.py | 14 ++---
tests/comparators/test_ipk.py | 14 ++---
tests/comparators/test_iso9660.py | 14 ++---
tests/comparators/test_java.py | 14 ++---
tests/comparators/test_mono.py | 14 ++---
tests/comparators/test_pdf.py | 14 ++---
tests/comparators/test_png.py | 14 ++---
tests/comparators/test_rpm.py | 14 ++---
tests/comparators/test_sqlite.py | 14 ++---
tests/comparators/test_squashfs.py | 14 ++---
tests/comparators/test_tar.py | 14 ++---
tests/comparators/test_text.py | 14 ++---
tests/comparators/test_utils.py | 14 ++---
tests/comparators/test_xz.py | 14 ++---
tests/comparators/test_zip.py | 14 ++---
75 files changed, 619 insertions(+), 592 deletions(-)
diff --git a/.gitignore b/.gitignore
index f7c580d..0d3d656 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
*.sw[p-z]
*.pyc
-/debbindiff.egg-info/
+/diffoscope.egg-info/
/dist/
.coverage
/htmlcov/
diff --git a/README b/README
index 2603ec0..c08d152 100644
--- a/README
+++ b/README
@@ -1,21 +1,30 @@
-debbindiff
+diffoscope
==========
-Highlight differences between two builds of Debian packages, and even
-other kind of files.
+diffoscope will try to get to the bottom of what makes files or
+directories different. It will recursively unpack archives of many kinds
+and transform various binary formats into more human readable form to
+compare them. It can compare two tarballs, ISO images, or PDF just as
+easily.
-debbindiff will exit with 0 if there's no differences and 1 if there
+It can be scripted through error codes, and a report can be produced
+with the detected differences. The report can be text or HTML.
+When no type of report has been selected, diffoscope defaults
+to write a text report on the standard output.
+
+diffoscope will exit with 0 if there's no differences and 1 if there
are. An HTML report can be produced with the detected differences.
-debbindiff was written as part of the “reproducible builds” Debian
+diffoscope is developed as part of the “reproducible builds” Debian
project: <https://wiki.debian.org/ReproducibleBuilds>
It is meant to be able to quickly understand why two builds of the same
-package produce different outputs.
+package produce different outputs. diffoscope was previously named
+debbindiff.
Example
-------
- $ ./debbindiff.py --html output.html build1.changes build2.changes
+ $ ./diffoscope.py --html output.html build1.changes build2.changes
This will compare `build1.changes` and `build2.changes` and create
`output.html` if there are differences between the two files.
@@ -26,25 +35,26 @@ External dependencies
The various comparators rely on external commands being available. To
get a list of them, please run:
- $ ./debbindiff.py --list-tools
+ $ ./diffoscope.py --list-tools
-Authors
--------
+Contributors
+------------
-Lunar <lunar at debian.org>
+Lunar, Reiner Herrmann, Chris Lamb, Helmut Grohne, Holger Levsen,
+Yasushi SHOJI, Daniel Kahn Gillmor, Peter De Wachter.
License
-------
-debbindiff is free software: you can redistribute it and/or modify
+diffoscope is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-debbindiff is distributed in the hope that it will be useful,
+diffoscope is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
diff --git a/debian/README.source b/debian/README.source
index 27d263e..8dc0863 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,4 +1,4 @@
-debbindiff: hacking tips
+diffoscope: hacking tips
========================
Running the test suite
@@ -11,4 +11,4 @@ the tests are then:
To get code coverage:
- $ py.test --cov debbindiff --cov-report html
+ $ py.test --cov diffoscope --cov-report html
diff --git a/debian/control b/debian/control
index e854ee4..db93d93 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: debbindiff
+Source: diffoscope
Section: devel
Priority: optional
Maintainer: Reproducible builds folks <reproducible-builds at lists.alioth.debian.org>
@@ -19,22 +19,33 @@ Build-Depends: debhelper (>= 9),
rpm-common
Standards-Version: 3.9.6
X-Python-Version: >= 2.7
-Homepage: https://wiki.debian.org/ReproducibleBuilds
-Vcs-Git: git://anonscm.debian.org/reproducible/debbindiff.git
-Vcs-Browser: https://anonscm.debian.org/cgit/reproducible/debbindiff.git
+Homepage: http://diffoscope.org/
+Vcs-Git: git://anonscm.debian.org/reproducible/diffoscope.git
+Vcs-Browser: https://anonscm.debian.org/cgit/reproducible/diffoscope.git
XS-Testsuite: autopkgtest
-Package: debbindiff
+Package: diffoscope
Architecture: all
Depends: ${misc:Depends},
${python:Depends},
-Recommends: ${debbindiff:Recommends}
-Description: highlight differences between two builds of Debian packages
- debbindiff was designed to easily compare two builds of the same Debian
- package, and understand their differences.
- .
- It can be scripted through error codes, and an HTML report can be produced
- with the detected differences.
+Recommends: ${diffoscope:Recommends}
+Breaks: debbindiff (<< 29)
+Replaces: debbindiff (<< 29)
+Description: in-depth comparison of files, archives, and directories
+ diffoscope will try to get to the bottom of what makes files or directories
+ different. It will recursively unpack archives of many kinds and transform
+ various binary formats into more human readable form to compare them. It can
+ compare two tarballs, ISO images, or PDF just as easily. The differences can
+ be shown in a text or HTML report.
.
- debbindiff was written as part of the “reproducible builds” Debian
- project.
+ diffoscope is developed as part of the “reproducible builds” Debian
+ project and was formerly known as “debbindiff”.
+
+Package: debbindiff
+Depends: diffoscope, ${misc:Depends}
+Architecture: all
+Priority: extra
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed once
+ callers have been update to use 'diffoscope' instead of 'debbindiff'.
diff --git a/debian/copyright b/debian/copyright
index 6ae8032..3cb4082 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: debbindiff
-Source: https://anonscm.debian.org/cgit/reproducible/debbindiff.git/
+Upstream-Name: diffoscope
+Source: https://anonscm.debian.org/cgit/reproducible/diffoscope.git/
Files: *
Copyright: 2014-2015 Jérémy Bobbio <lunar at debian.org>
License: GPL-3+
-Files: debbindiff/changes.py
+Files: diffoscope/changes.py
Copyright: 2008 Jonny Lamb <jonny at debian.org>
2010 Jan Dittberner <jandd at debian.org>
2012 Arno Töll <arno at debian.org>
@@ -14,37 +14,37 @@ Copyright: 2008 Jonny Lamb <jonny at debian.org>
2014-2015 Jérémy Bobbio <lunar at debian.org>
License: Expat
-Files: debbindiff/comparators/__init__.py
+Files: diffoscope/comparators/__init__.py
Copyright: 2014-2015 Jérémy Bobbio <lunar at debian.org>
2015 Helmut Grohne <helmut at subdivi.de>
2015 Chris Lamb <lamby at debian.org>
2015 Reiner Herrmann <reiner at reiner-h.de>
License: GPL-3+
-Files: debbindiff/comparators/bzip2.py
- debbindiff/comparators/elf.py
- debbindiff/comparators/fonts.py
- debbindiff/comparators/gettext.py
- debbindiff/comparators/gzip.py
- debbindiff/comparators/haskell.py
- debbindiff/comparators/pdf.py
- debbindiff/comparators/png.py
- debbindiff/comparators/utils.py
- debbindiff/comparators/xz.py
- debbindiff/comparators/zip.py
+Files: diffoscope/comparators/bzip2.py
+ diffoscope/comparators/elf.py
+ diffoscope/comparators/fonts.py
+ diffoscope/comparators/gettext.py
+ diffoscope/comparators/gzip.py
+ diffoscope/comparators/haskell.py
+ diffoscope/comparators/pdf.py
+ diffoscope/comparators/png.py
+ diffoscope/comparators/utils.py
+ diffoscope/comparators/xz.py
+ diffoscope/comparators/zip.py
Copyright: 2014-2015 Jérémy Bobbio <lunar at debian.org>
2015 Reiner Herrmann <reiner at reiner-h.de>
License: GPL-3+
-Files: debbindiff/comparators/cpio.py
- debbindiff/comparators/directory.py
- debbindiff/comparators/rpm.py
- debbindiff/comparators/squashfs.py
+Files: diffoscope/comparators/cpio.py
+ diffoscope/comparators/directory.py
+ diffoscope/comparators/rpm.py
+ diffoscope/comparators/squashfs.py
Copyright: 2015 Reiner Herrmann <reiner at reiner-h.de>
2015 Jérémy Bobbio <lunar at debian.org>
License: GPL-3+
-Files: debbindiff/presenters/html.py
+Files: diffoscope/presenters/html.py
Copyright: 2014-2015 Jérémy Bobbio <lunar at debian.org>
2015 Reiner Herrmann <reiner at reiner-h.de>
2012-2013 Olivier Matz <zer0 at droids-corp.org>
@@ -53,7 +53,7 @@ Copyright: 2014-2015 Jérémy Bobbio <lunar at debian.org>
2012 scito <info at scito.ch>
License: GPL-3+
-Files: debbindiff/presenters/text.py
+Files: diffoscope/presenters/text.py
Copyright: 2015 Jérémy Bobbio <lunar at debian.org>
2015 Helmut Grohne <helmut at subdivi.de>
License: GPL-3+
diff --git a/debian/debbindiff.links b/debian/debbindiff.links
new file mode 100644
index 0000000..95d6567
--- /dev/null
+++ b/debian/debbindiff.links
@@ -0,0 +1,2 @@
+usr/bin/diffoscope usr/bin/debbindiff
+usr/share/man/man1/diffoscope.1.gz usr/share/man/man1/debbindiff.1.gz
diff --git a/debian/debbindiff.manpages b/debian/debbindiff.manpages
deleted file mode 100644
index d7bd886..0000000
--- a/debian/debbindiff.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/debbindiff.1
diff --git a/debian/debbindiff.1.rst b/debian/diffoscope.1.rst
similarity index 60%
rename from debian/debbindiff.1.rst
rename to debian/diffoscope.1.rst
index 5a8aa10..2b4c897 100644
--- a/debian/debbindiff.1.rst
+++ b/debian/diffoscope.1.rst
@@ -1,10 +1,10 @@
============
- debbindiff
+ diffoscope
============
------------------------------------------------------------
-highlight differences between two builds of Debian packages
------------------------------------------------------------
+-------------------------------------------------------
+in-depth comparison of files, archives, and directories
+-------------------------------------------------------
:Author: lunar at debian.org
:Copyright: GPL-3+
@@ -14,21 +14,24 @@ highlight differences between two builds of Debian packages
SYNOPSIS
========
- debbindiff [-h] [--version] [--debug] [--html output] [--text output] [--max-report-size bytes] [--css url] file1 file2
+ diffoscope [-h] [--version] [--debug] [--html output] [--text output] [--max-report-size bytes] [--css url] file1 file2
DESCRIPTION
===========
-debbindiff was designed to easily compare two builds of the same Debian
-package, and understand their differences.
+diffoscope will try to get to the bottom of what makes files or
+directories different. It will recursively unpack archives of many kinds
+and transform various binary formats into more human readable form to
+compare them. It can compare two tarballs, ISO images, or PDF just as
+easily.
It can be scripted through error codes, and a report can be produced
with the detected differences. The report can be text or HTML.
-When no type of report has been selected, debbindiff defaults
+When no type of report has been selected, diffoscope defaults
to write a text report on the standard output.
-debbindiff was written as part of the “reproducible builds” Debian
-project.
+diffoscope is developed as part of the “reproducible builds” Debian
+project and was formerly known as “debbindiff”.
OPTIONS
=======
@@ -51,4 +54,5 @@ Exit status is 0 if inputs are the same, 1 if different, 2 if trouble.
SEE ALSO
========
+* `<http://diffoscope.org/>`
* `<https://wiki.debian.org/ReproducibleBuilds>`
diff --git a/debian/debbindiff.docs b/debian/diffoscope.docs
similarity index 100%
rename from debian/debbindiff.docs
rename to debian/diffoscope.docs
diff --git a/debian/diffoscope.manpages b/debian/diffoscope.manpages
new file mode 100644
index 0000000..3a8e1e1
--- /dev/null
+++ b/debian/diffoscope.manpages
@@ -0,0 +1 @@
+debian/diffoscope.1
diff --git a/debian/rules b/debian/rules
index a30453e..b21e4df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,24 +6,24 @@ VERSION = $(shell dpkg-parsechangelog --show-field Version)
dh $@ --with python2 --buildsystem=pybuild
override_dh_gencontrol:
- echo "debbindiff:Recommends=$$(./debbindiff.py --list-tools | tail -n 1 | \
- sed -e 's/\(^\| \)\(coreutils\|diffutils\|e2fsprogs\|findutils\|gzip\)\(,\|$$\)//g')" >> debian/debbindiff.substvars
+ echo "diffoscope:Recommends=$$(./diffoscope.py --list-tools | tail -n 1 | \
+ sed -e 's/\(^\| \)\(coreutils\|diffutils\|e2fsprogs\|findutils\|gzip\)\(,\|$$\)//g')" >> debian/diffoscope.substvars
dh_gencontrol -O--buildsystem=python_distutils
override_dh_install:
- mv debian/debbindiff/usr/bin/debbindiff.py debian/debbindiff/usr/bin/debbindiff
+ mv debian/diffoscope/usr/bin/diffoscope.py debian/diffoscope/usr/bin/diffoscope
dh_install -O--buildsystem=python_distutils
-debian/debbindiff.1: debian/debbindiff.1.rst
+debian/diffoscope.1: debian/diffoscope.1.rst
rst2man $< $@
-override_dh_installman: debian/debbindiff.1
+override_dh_installman: debian/diffoscope.1
dh_installman -O--buildsystem=python_distutils
override_dh_clean:
- rm -f debian/debbindiff.1
- @if ! grep -q 'VERSION = "$(VERSION)"' debbindiff/__init__.py; then \
- echo "Version in debian/changelog doesn't match debbindiff version"; \
+ rm -f debian/diffoscope.1
+ @if ! grep -q 'VERSION = "$(VERSION)"' diffoscope/__init__.py; then \
+ echo "Version in debian/changelog doesn't match diffoscope version"; \
exit 1; \
fi
dh_clean -O--buildsystem=python_distutils
diff --git a/debian/tests/control b/debian/tests/control
index 8a6e066..ead0816 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
Tests: pytest
-Depends: debbindiff, python-pytest
+Depends: diffoscope, python-pytest
Restrictions: needs-recommends
diff --git a/debbindiff.py b/diffoscope.py
similarity index 85%
rename from debbindiff.py
rename to diffoscope.py
index ff13f1f..35c036d 100755
--- a/debbindiff.py
+++ b/diffoscope.py
@@ -1,22 +1,22 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
@@ -27,10 +27,10 @@ import codecs
import os
import sys
import traceback
-from debbindiff import logger, VERSION, set_locale
-import debbindiff.comparators
-from debbindiff.presenters.html import output_html
-from debbindiff.presenters.text import output_text
+from diffoscope import logger, VERSION, set_locale
+import diffoscope.comparators
+from diffoscope.presenters.html import output_html
+from diffoscope.presenters.text import output_text
def create_parser():
@@ -38,7 +38,7 @@ def create_parser():
description='Highlight differences between two builds '
'of Debian packages')
parser.add_argument('--version', action='version',
- version='debbindiff %s' % VERSION)
+ version='diffoscope %s' % VERSION)
parser.add_argument('--list-tools', nargs=0, action=ListToolsAction,
help='show external tools required and exit')
parser.add_argument('--debug', dest='debug', action='store_true',
@@ -75,7 +75,7 @@ def make_printer(path):
class ListToolsAction(argparse.Action):
def __call__(self, parser, namespace, values, option_string=None):
- from debbindiff import tool_required, RequiredToolNotFound
+ from diffoscope import tool_required, RequiredToolNotFound
print("External tools required:")
print(', '.join(tool_required.all))
print()
@@ -90,7 +90,7 @@ def main():
if parsed_args.debug:
logger.setLevel(logging.DEBUG)
set_locale()
- difference = debbindiff.comparators.compare_root_paths(
+ difference = diffoscope.comparators.compare_root_paths(
parsed_args.file1, parsed_args.file2)
if difference:
if parsed_args.html_output:
diff --git a/debbindiff/__init__.py b/diffoscope/__init__.py
similarity index 92%
rename from debbindiff/__init__.py
rename to diffoscope/__init__.py
index d0ec0d1..7b6d47f 100644
--- a/debbindiff/__init__.py
+++ b/diffoscope/__init__.py
@@ -1,21 +1,21 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from functools import wraps
import logging
@@ -24,7 +24,7 @@ import os
VERSION = "28"
-logger = logging.getLogger("debbindiff")
+logger = logging.getLogger("diffoscope")
logger.setLevel(logging.WARNING)
ch = logging.StreamHandler()
ch.setLevel(logging.DEBUG)
diff --git a/debbindiff/changes.py b/diffoscope/changes.py
similarity index 99%
rename from debbindiff/changes.py
rename to diffoscope/changes.py
index cd236af..0189dc4 100644
--- a/debbindiff/changes.py
+++ b/diffoscope/changes.py
@@ -46,7 +46,7 @@ import os.path
import hashlib
import subprocess
from debian import deb822
-from debbindiff import logger, tool_required
+from diffoscope import logger, tool_required
class ChangesFileException(Exception):
diff --git a/debbindiff/comparators/__init__.py b/diffoscope/comparators/__init__.py
similarity index 64%
rename from debbindiff/comparators/__init__.py
rename to diffoscope/comparators/__init__.py
index cf28f82..fa8bd5c 100644
--- a/debbindiff/comparators/__init__.py
+++ b/diffoscope/comparators/__init__.py
@@ -1,22 +1,22 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
# © 2015 Helmut Grohne <helmut at subdivi.de>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import magic
import operator
@@ -24,40 +24,40 @@ import os.path
import re
import sys
import ssdeep
-from debbindiff import logger, tool_required
-from debbindiff.difference import Difference
-from debbindiff.comparators.binary import \
+from diffoscope import logger, tool_required
+from diffoscope.difference import Difference
+from diffoscope.comparators.binary import \
File, FilesystemFile, compare_binary_files
-from debbindiff.comparators.bzip2 import Bzip2File
-from debbindiff.comparators.java import ClassFile
-from debbindiff.comparators.cpio import CpioFile
-from debbindiff.comparators.deb import DebFile, Md5sumsFile, DebDataTarFile
-from debbindiff.comparators.debian import DotChangesFile
-from debbindiff.comparators.device import Device
-from debbindiff.comparators.directory import Directory, compare_directories
-from debbindiff.comparators.elf import ElfFile, StaticLibFile
-from debbindiff.comparators.fonts import TtfFile
-from debbindiff.comparators.gettext import MoFile
-from debbindiff.comparators.gzip import GzipFile
-from debbindiff.comparators.haskell import HiFile
-from debbindiff.comparators.ipk import IpkFile
-from debbindiff.comparators.iso9660 import Iso9660File
-from debbindiff.comparators.mono import MonoExeFile
-from debbindiff.comparators.pdf import PdfFile
-from debbindiff.comparators.png import PngFile
+from diffoscope.comparators.bzip2 import Bzip2File
+from diffoscope.comparators.java import ClassFile
+from diffoscope.comparators.cpio import CpioFile
+from diffoscope.comparators.deb import DebFile, Md5sumsFile, DebDataTarFile
+from diffoscope.comparators.debian import DotChangesFile
+from diffoscope.comparators.device import Device
+from diffoscope.comparators.directory import Directory, compare_directories
+from diffoscope.comparators.elf import ElfFile, StaticLibFile
+from diffoscope.comparators.fonts import TtfFile
+from diffoscope.comparators.gettext import MoFile
+from diffoscope.comparators.gzip import GzipFile
+from diffoscope.comparators.haskell import HiFile
+from diffoscope.comparators.ipk import IpkFile
+from diffoscope.comparators.iso9660 import Iso9660File
+from diffoscope.comparators.mono import MonoExeFile
+from diffoscope.comparators.pdf import PdfFile
+from diffoscope.comparators.png import PngFile
try:
- from debbindiff.comparators.rpm import RpmFile
+ from diffoscope.comparators.rpm import RpmFile
except ImportError as ex:
if ex.message != 'No module named rpm':
raise
- from debbindiff.comparators.rpm_fallback import RpmFile
-from debbindiff.comparators.sqlite import Sqlite3Database
-from debbindiff.comparators.squashfs import SquashfsFile
-from debbindiff.comparators.symlink import Symlink
-from debbindiff.comparators.text import TextFile
-from debbindiff.comparators.tar import TarFile
-from debbindiff.comparators.xz import XzFile
-from debbindiff.comparators.zip import ZipFile
+ from diffoscope.comparators.rpm_fallback import RpmFile
+from diffoscope.comparators.sqlite import Sqlite3Database
+from diffoscope.comparators.squashfs import SquashfsFile
+from diffoscope.comparators.symlink import Symlink
+from diffoscope.comparators.text import TextFile
+from diffoscope.comparators.tar import TarFile
+from diffoscope.comparators.xz import XzFile
+from diffoscope.comparators.zip import ZipFile
def compare_root_paths(path1, path2):
diff --git a/debbindiff/comparators/binary.py b/diffoscope/comparators/binary.py
similarity index 95%
rename from debbindiff/comparators/binary.py
rename to diffoscope/comparators/binary.py
index 523ba00..e92ca82 100644
--- a/debbindiff/comparators/binary.py
+++ b/diffoscope/comparators/binary.py
@@ -1,21 +1,21 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from abc import ABCMeta, abstractproperty, abstractmethod
from binascii import hexlify
@@ -28,8 +28,8 @@ from stat import S_ISCHR, S_ISBLK
import subprocess
import ssdeep
import magic
-from debbindiff.difference import Difference
-from debbindiff import tool_required, RequiredToolNotFound, logger
+from diffoscope.difference import Difference
+from diffoscope import tool_required, RequiredToolNotFound, logger
@contextmanager
diff --git a/debbindiff/comparators/bzip2.py b/diffoscope/comparators/bzip2.py
similarity index 79%
rename from debbindiff/comparators/bzip2.py
rename to diffoscope/comparators/bzip2.py
index 1a00445..49156e2 100644
--- a/debbindiff/comparators/bzip2.py
+++ b/diffoscope/comparators/bzip2.py
@@ -1,30 +1,30 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from contextlib import contextmanager
import os.path
import re
import subprocess
-import debbindiff.comparators
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.comparators.utils import Archive, get_compressed_content_name
-from debbindiff import logger, tool_required
+import diffoscope.comparators
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.comparators.utils import Archive, get_compressed_content_name
+from diffoscope import logger, tool_required
class Bzip2Container(Archive):
@@ -58,7 +58,7 @@ class Bzip2Container(Archive):
source = None
if my_file.name == other_file.name:
source = my_file.name
- return [debbindiff.comparators.compare_files(my_file, other_file, source)]
+ return [diffoscope.comparators.compare_files(my_file, other_file, source)]
class Bzip2File(File):
diff --git a/debbindiff/comparators/cpio.py b/diffoscope/comparators/cpio.py
similarity index 71%
rename from debbindiff/comparators/cpio.py
rename to diffoscope/comparators/cpio.py
index f37d23c..53ca6e4 100644
--- a/debbindiff/comparators/cpio.py
+++ b/diffoscope/comparators/cpio.py
@@ -1,32 +1,32 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Reiner Herrmann <reiner at reiner-h.de>
# 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import re
import subprocess
import os.path
-import debbindiff.comparators
-from debbindiff import logger, tool_required
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.comparators.libarchive import LibarchiveContainer
-from debbindiff.comparators.utils import Command
-from debbindiff.difference import Difference
+import diffoscope.comparators
+from diffoscope import logger, tool_required
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.comparators.libarchive import LibarchiveContainer
+from diffoscope.comparators.utils import Command
+from diffoscope.difference import Difference
class CpioContent(Command):
diff --git a/debbindiff/comparators/deb.py b/diffoscope/comparators/deb.py
similarity index 91%
rename from debbindiff/comparators/deb.py
rename to diffoscope/comparators/deb.py
index dc1f796..f6dd4f4 100644
--- a/debbindiff/comparators/deb.py
+++ b/diffoscope/comparators/deb.py
@@ -1,34 +1,34 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from __future__ import absolute_import
import re
import os.path
from debian.arfile import ArFile
-from debbindiff import logger
-from debbindiff.difference import Difference
-import debbindiff.comparators
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.comparators.utils import \
+from diffoscope import logger
+from diffoscope.difference import Difference
+import diffoscope.comparators
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.comparators.utils import \
Archive, ArchiveMember, get_ar_content
-from debbindiff.comparators.tar import TarContainer, get_tar_listing
+from diffoscope.comparators.tar import TarContainer, get_tar_listing
AR_EXTRACTION_BUFFER_SIZE = 32768
diff --git a/debbindiff/comparators/debian.py b/diffoscope/comparators/debian.py
similarity index 87%
rename from debbindiff/comparators/debian.py
rename to diffoscope/comparators/debian.py
index d17ede0..1966a43 100644
--- a/debbindiff/comparators/debian.py
+++ b/diffoscope/comparators/debian.py
@@ -1,32 +1,32 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from contextlib import contextmanager
import os.path
import re
import sys
-from debbindiff import logger
-from debbindiff.changes import Changes
-import debbindiff.comparators
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.comparators.utils import Container
-from debbindiff.difference import Difference, get_source
+from diffoscope import logger
+from diffoscope.changes import Changes
+import diffoscope.comparators
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.comparators.utils import Container
+from diffoscope.difference import Difference, get_source
DOT_CHANGES_FIELDS = [
@@ -101,7 +101,7 @@ class DotChangesContainer(Container):
if my_canonical_names[canonical_name] == other_canonical_names[canonical_name]:
source = my_canonical_names[canonical_name]
differences.append(
- debbindiff.comparators.compare_files(my_file, other_file, source=source))
+ diffoscope.comparators.compare_files(my_file, other_file, source=source))
return differences
diff --git a/debbindiff/comparators/device.py b/diffoscope/comparators/device.py
similarity index 73%
rename from debbindiff/comparators/device.py
rename to diffoscope/comparators/device.py
index 5b22da8..9833d29 100644
--- a/debbindiff/comparators/device.py
+++ b/diffoscope/comparators/device.py
@@ -1,30 +1,30 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from contextlib import contextmanager
import os
from stat import S_ISCHR, S_ISBLK
import tempfile
-from debbindiff.comparators.binary import File, FilesystemFile, needs_content
-from debbindiff.comparators.utils import format_device
-from debbindiff.difference import Difference
-from debbindiff import logger
+from diffoscope.comparators.binary import File, FilesystemFile, needs_content
+from diffoscope.comparators.utils import format_device
+from diffoscope.difference import Difference
+from diffoscope import logger
class Device(File):
@@ -39,7 +39,7 @@ class Device(File):
@contextmanager
def get_content(self):
- with tempfile.NamedTemporaryFile(suffix='debbindiff') as f:
+ with tempfile.NamedTemporaryFile(suffix='diffoscope') as f:
f.write(format_device(*self.get_device()))
f.flush()
self._path = f.name
diff --git a/debbindiff/comparators/directory.py b/diffoscope/comparators/directory.py
similarity index 90%
rename from debbindiff/comparators/directory.py
rename to diffoscope/comparators/directory.py
index c23cf58..e7a468d 100644
--- a/debbindiff/comparators/directory.py
+++ b/diffoscope/comparators/directory.py
@@ -1,31 +1,31 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from contextlib import contextmanager
import os.path
import re
import subprocess
-from debbindiff import logger, tool_required, RequiredToolNotFound
-from debbindiff.difference import Difference
-import debbindiff.comparators
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.utils import Container, Command
+from diffoscope import logger, tool_required, RequiredToolNotFound
+from diffoscope.difference import Difference
+import diffoscope.comparators
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.utils import Container, Command
class FindAll(Command):
@@ -140,7 +140,7 @@ class FilesystemDirectory(object):
my_file = my_container.get_member(name)
other_file = other_container.get_member(name)
with my_file.get_content(), other_file.get_content():
- inner_difference = debbindiff.comparators.compare_files(
+ inner_difference = diffoscope.comparators.compare_files(
my_file, other_file, source=name)
meta_differences = compare_meta(my_file.path, other_file.path)
if meta_differences and not inner_difference:
diff --git a/debbindiff/comparators/elf.py b/diffoscope/comparators/elf.py
similarity index 88%
rename from debbindiff/comparators/elf.py
rename to diffoscope/comparators/elf.py
index 453efb3..3520e62 100644
--- a/debbindiff/comparators/elf.py
+++ b/diffoscope/comparators/elf.py
@@ -1,29 +1,29 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import os.path
import re
import subprocess
-from debbindiff import tool_required
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.comparators.utils import get_ar_content, Command
-from debbindiff.difference import Difference
+from diffoscope import tool_required
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.comparators.utils import get_ar_content, Command
+from diffoscope.difference import Difference
class Readelf(Command):
diff --git a/debbindiff/comparators/fonts.py b/diffoscope/comparators/fonts.py
similarity index 70%
rename from debbindiff/comparators/fonts.py
rename to diffoscope/comparators/fonts.py
index 7e92a23..c20e31b 100644
--- a/debbindiff/comparators/fonts.py
+++ b/diffoscope/comparators/fonts.py
@@ -1,29 +1,29 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import locale
import re
import subprocess
-from debbindiff import tool_required
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.comparators.utils import Command
-from debbindiff.difference import Difference
+from diffoscope import tool_required
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.comparators.utils import Command
+from diffoscope.difference import Difference
class Showttf(Command):
diff --git a/debbindiff/comparators/gettext.py b/diffoscope/comparators/gettext.py
similarity index 79%
rename from debbindiff/comparators/gettext.py
rename to diffoscope/comparators/gettext.py
index f65e57a..6c23d8c 100644
--- a/debbindiff/comparators/gettext.py
+++ b/diffoscope/comparators/gettext.py
@@ -1,30 +1,30 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import re
import subprocess
from StringIO import StringIO
-from debbindiff import tool_required
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.comparators.utils import Command
-from debbindiff.difference import Difference
-from debbindiff import logger
+from diffoscope import tool_required
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.comparators.utils import Command
+from diffoscope.difference import Difference
+from diffoscope import logger
class Msgunfmt(Command):
diff --git a/debbindiff/comparators/gzip.py b/diffoscope/comparators/gzip.py
similarity index 79%
rename from debbindiff/comparators/gzip.py
rename to diffoscope/comparators/gzip.py
index a60f458..c543604 100644
--- a/debbindiff/comparators/gzip.py
+++ b/diffoscope/comparators/gzip.py
@@ -1,32 +1,32 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from contextlib import contextmanager
import re
import subprocess
import os.path
-import debbindiff.comparators
-from debbindiff import tool_required
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.comparators.utils import Archive, get_compressed_content_name
-from debbindiff.difference import Difference
-from debbindiff import logger, tool_required
+import diffoscope.comparators
+from diffoscope import tool_required
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.comparators.utils import Archive, get_compressed_content_name
+from diffoscope.difference import Difference
+from diffoscope import logger, tool_required
class GzipContainer(Archive):
@@ -60,7 +60,7 @@ class GzipContainer(Archive):
source = None
if my_file.name == other_file.name:
source = my_file.name
- return [debbindiff.comparators.compare_files(my_file, other_file, source)]
+ return [diffoscope.comparators.compare_files(my_file, other_file, source)]
class GzipFile(object):
diff --git a/debbindiff/comparators/haskell.py b/diffoscope/comparators/haskell.py
similarity index 82%
rename from debbindiff/comparators/haskell.py
rename to diffoscope/comparators/haskell.py
index a222b44..495607d 100644
--- a/debbindiff/comparators/haskell.py
+++ b/diffoscope/comparators/haskell.py
@@ -1,30 +1,30 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import re
import struct
import subprocess
-from debbindiff import tool_required
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.comparators.utils import Command
-from debbindiff.difference import Difference
-from debbindiff import logger
+from diffoscope import tool_required
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.comparators.utils import Command
+from diffoscope.difference import Difference
+from diffoscope import logger
class ShowIface(Command):
diff --git a/debbindiff/comparators/ipk.py b/diffoscope/comparators/ipk.py
similarity index 68%
rename from debbindiff/comparators/ipk.py
rename to diffoscope/comparators/ipk.py
index 4181738..ad5e87d 100644
--- a/debbindiff/comparators/ipk.py
+++ b/diffoscope/comparators/ipk.py
@@ -1,27 +1,27 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Reiner Herrmann <reiner at reiner-h.de>
# 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import re
import os.path
-from debbindiff.comparators.gzip import GzipFile
-from debbindiff.difference import Difference
+from diffoscope.comparators.gzip import GzipFile
+from diffoscope.difference import Difference
class IpkFile(GzipFile):
diff --git a/debbindiff/comparators/iso9660.py b/diffoscope/comparators/iso9660.py
similarity index 81%
rename from debbindiff/comparators/iso9660.py
rename to diffoscope/comparators/iso9660.py
index 9ac3748..f1687b2 100644
--- a/debbindiff/comparators/iso9660.py
+++ b/diffoscope/comparators/iso9660.py
@@ -1,31 +1,31 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import os.path
import re
import subprocess
-import debbindiff.comparators
-from debbindiff import logger, tool_required
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.comparators.libarchive import LibarchiveContainer
-from debbindiff.comparators.utils import Command
-from debbindiff.difference import Difference
+import diffoscope.comparators
+from diffoscope import logger, tool_required
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.comparators.libarchive import LibarchiveContainer
+from diffoscope.comparators.utils import Command
+from diffoscope.difference import Difference
@tool_required('isoinfo')
diff --git a/debbindiff/comparators/java.py b/diffoscope/comparators/java.py
similarity index 75%
rename from debbindiff/comparators/java.py
rename to diffoscope/comparators/java.py
index 615985f..24c8bb2 100644
--- a/debbindiff/comparators/java.py
+++ b/diffoscope/comparators/java.py
@@ -1,29 +1,29 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Reiner Herrmann <reiner at reiner-h.de>
# 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import os.path
import re
-from debbindiff import tool_required
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.comparators.utils import Command
-from debbindiff.difference import Difference
+from diffoscope import tool_required
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.comparators.utils import Command
+from diffoscope.difference import Difference
class Javap(Command):
diff --git a/debbindiff/comparators/libarchive.py b/diffoscope/comparators/libarchive.py
similarity index 90%
rename from debbindiff/comparators/libarchive.py
rename to diffoscope/comparators/libarchive.py
index c4791cf..68658a1 100644
--- a/debbindiff/comparators/libarchive.py
+++ b/diffoscope/comparators/libarchive.py
@@ -1,21 +1,21 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from __future__ import absolute_import
@@ -24,11 +24,11 @@ import ctypes
from itertools import dropwhile
import os.path
import libarchive
-from debbindiff import logger
-from debbindiff.comparators.device import Device
-from debbindiff.comparators.directory import Directory
-from debbindiff.comparators.symlink import Symlink
-from debbindiff.comparators.utils import Archive, ArchiveMember
+from diffoscope import logger
+from diffoscope.comparators.device import Device
+from diffoscope.comparators.directory import Directory
+from diffoscope.comparators.symlink import Symlink
+from diffoscope.comparators.utils import Archive, ArchiveMember
# Monkeypatch libarchive-c (<< 2.2)
diff --git a/debbindiff/comparators/mono.py b/diffoscope/comparators/mono.py
similarity index 69%
rename from debbindiff/comparators/mono.py
rename to diffoscope/comparators/mono.py
index 6a5b10f..c563390 100644
--- a/debbindiff/comparators/mono.py
+++ b/diffoscope/comparators/mono.py
@@ -1,28 +1,28 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
# 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import re
-from debbindiff import tool_required
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.comparators.utils import Command
-from debbindiff.difference import Difference
+from diffoscope import tool_required
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.comparators.utils import Command
+from diffoscope.difference import Difference
class Pedump(Command):
diff --git a/debbindiff/comparators/pdf.py b/diffoscope/comparators/pdf.py
similarity index 74%
rename from debbindiff/comparators/pdf.py
rename to diffoscope/comparators/pdf.py
index d4512e6..a8385dc 100644
--- a/debbindiff/comparators/pdf.py
+++ b/diffoscope/comparators/pdf.py
@@ -1,28 +1,28 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import re
import subprocess
-from debbindiff import tool_required
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.comparators.utils import Command
-from debbindiff.difference import Difference, get_source
+from diffoscope import tool_required
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.comparators.utils import Command
+from diffoscope.difference import Difference, get_source
class Pdftotext(Command):
diff --git a/debbindiff/comparators/png.py b/diffoscope/comparators/png.py
similarity index 73%
rename from debbindiff/comparators/png.py
rename to diffoscope/comparators/png.py
index e99be95..62b1ac2 100644
--- a/debbindiff/comparators/png.py
+++ b/diffoscope/comparators/png.py
@@ -1,29 +1,29 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from functools import partial
import re
import subprocess
-from debbindiff import tool_required
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.comparators.utils import Command
-from debbindiff.difference import Difference
+from diffoscope import tool_required
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.comparators.utils import Command
+from diffoscope.difference import Difference
class Sng(Command):
diff --git a/debbindiff/comparators/rpm.py b/diffoscope/comparators/rpm.py
similarity index 82%
rename from debbindiff/comparators/rpm.py
rename to diffoscope/comparators/rpm.py
index 9cf25e7..faebc3e 100644
--- a/debbindiff/comparators/rpm.py
+++ b/diffoscope/comparators/rpm.py
@@ -1,22 +1,22 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Reiner Herrmann <reiner at reiner-h.de>
# 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from __future__ import absolute_import
import os.path
@@ -24,12 +24,12 @@ import re
import subprocess
from contextlib import contextmanager
import rpm
-from debbindiff import logger, tool_required
-import debbindiff.comparators
-from debbindiff.comparators.rpm_fallback import AbstractRpmFile
-from debbindiff.comparators.binary import File, FilesystemFile, needs_content
-from debbindiff.comparators.utils import Archive, make_temp_directory
-from debbindiff.difference import Difference, get_source
+from diffoscope import logger, tool_required
+import diffoscope.comparators
+from diffoscope.comparators.rpm_fallback import AbstractRpmFile
+from diffoscope.comparators.binary import File, FilesystemFile, needs_content
+from diffoscope.comparators.utils import Archive, make_temp_directory
+from diffoscope.difference import Difference, get_source
def get_rpm_header(path, ts):
header = ''
diff --git a/debbindiff/comparators/rpm_fallback.py b/diffoscope/comparators/rpm_fallback.py
similarity index 76%
rename from debbindiff/comparators/rpm_fallback.py
rename to diffoscope/comparators/rpm_fallback.py
index 372c90a..9e86fd3 100644
--- a/debbindiff/comparators/rpm_fallback.py
+++ b/diffoscope/comparators/rpm_fallback.py
@@ -1,24 +1,24 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import re
-from debbindiff.comparators.binary import File
+from diffoscope.comparators.binary import File
class AbstractRpmFile(File):
RE_FILE_TYPE = re.compile('^RPM\s')
diff --git a/debbindiff/comparators/sqlite.py b/diffoscope/comparators/sqlite.py
similarity index 67%
rename from debbindiff/comparators/sqlite.py
rename to diffoscope/comparators/sqlite.py
index 0925690..b3320c8 100644
--- a/debbindiff/comparators/sqlite.py
+++ b/diffoscope/comparators/sqlite.py
@@ -1,26 +1,26 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
-from debbindiff import tool_required
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.comparators.utils import Command
-from debbindiff.difference import Difference
+from diffoscope import tool_required
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.comparators.utils import Command
+from diffoscope.difference import Difference
class Sqlite3Dump(Command):
diff --git a/debbindiff/comparators/squashfs.py b/diffoscope/comparators/squashfs.py
similarity index 89%
rename from debbindiff/comparators/squashfs.py
rename to diffoscope/comparators/squashfs.py
index b6ba975..f31296b 100644
--- a/debbindiff/comparators/squashfs.py
+++ b/diffoscope/comparators/squashfs.py
@@ -1,37 +1,37 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Reiner Herrmann <reiner at reiner-h.de>
# 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import re
import subprocess
import os.path
import stat
-import debbindiff.comparators
-from debbindiff import logger, tool_required
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.comparators.device import Device
-from debbindiff.comparators.directory import Directory
-from debbindiff.comparators.libarchive import LibarchiveContainer
-from debbindiff.comparators.symlink import Symlink
-from debbindiff.comparators.utils import Archive, ArchiveMember, Command
-from debbindiff.difference import Difference
-from debbindiff import logger
+import diffoscope.comparators
+from diffoscope import logger, tool_required
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.comparators.device import Device
+from diffoscope.comparators.directory import Directory
+from diffoscope.comparators.libarchive import LibarchiveContainer
+from diffoscope.comparators.symlink import Symlink
+from diffoscope.comparators.utils import Archive, ArchiveMember, Command
+from diffoscope.difference import Difference
+from diffoscope import logger
class SquashfsSuperblock(Command):
diff --git a/debbindiff/comparators/symlink.py b/diffoscope/comparators/symlink.py
similarity index 71%
rename from debbindiff/comparators/symlink.py
rename to diffoscope/comparators/symlink.py
index b87cdec..b243278 100644
--- a/debbindiff/comparators/symlink.py
+++ b/diffoscope/comparators/symlink.py
@@ -1,29 +1,29 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from contextlib import contextmanager
import os
import tempfile
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.comparators.utils import format_symlink
-from debbindiff.difference import Difference
-from debbindiff import logger
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.comparators.utils import format_symlink
+from diffoscope.difference import Difference
+from diffoscope import logger
class Symlink(File):
@@ -37,7 +37,7 @@ class Symlink(File):
@contextmanager
def get_content(self):
- with tempfile.NamedTemporaryFile(suffix='debbindiff') as f:
+ with tempfile.NamedTemporaryFile(suffix='diffoscope') as f:
f.write(format_symlink(self.symlink_destination))
f.flush()
self._path = f.name
diff --git a/debbindiff/comparators/tar.py b/diffoscope/comparators/tar.py
similarity index 86%
rename from debbindiff/comparators/tar.py
rename to diffoscope/comparators/tar.py
index d7e0440..3e6c86c 100644
--- a/debbindiff/comparators/tar.py
+++ b/diffoscope/comparators/tar.py
@@ -1,21 +1,21 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import os.path
import re
@@ -23,14 +23,14 @@ import stat
from StringIO import StringIO
import sys
import tarfile
-from debbindiff import logger
-from debbindiff.difference import Difference
-import debbindiff.comparators
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.comparators.device import Device
-from debbindiff.comparators.directory import Directory
-from debbindiff.comparators.symlink import Symlink
-from debbindiff.comparators.utils import Archive, ArchiveMember
+from diffoscope import logger
+from diffoscope.difference import Difference
+import diffoscope.comparators
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.comparators.device import Device
+from diffoscope.comparators.directory import Directory
+from diffoscope.comparators.symlink import Symlink
+from diffoscope.comparators.utils import Archive, ArchiveMember
class TarMember(ArchiveMember):
def is_directory(self):
diff --git a/debbindiff/comparators/text.py b/diffoscope/comparators/text.py
similarity index 82%
rename from debbindiff/comparators/text.py
rename to diffoscope/comparators/text.py
index 14f0f00..8112925 100644
--- a/debbindiff/comparators/text.py
+++ b/diffoscope/comparators/text.py
@@ -1,27 +1,27 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import codecs
import re
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.difference import Difference
-from debbindiff import logger
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.difference import Difference
+from diffoscope import logger
class TextFile(File):
diff --git a/debbindiff/comparators/utils.py b/diffoscope/comparators/utils.py
similarity index 91%
rename from debbindiff/comparators/utils.py
rename to diffoscope/comparators/utils.py
index 9c51ef7..e39e5ec 100644
--- a/debbindiff/comparators/utils.py
+++ b/diffoscope/comparators/utils.py
@@ -1,21 +1,21 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from abc import ABCMeta, abstractmethod
from contextlib import contextmanager
@@ -29,16 +29,16 @@ from StringIO import StringIO
import subprocess
import tempfile
from threading import Thread
-import debbindiff.comparators
-from debbindiff.comparators.binary import \
+import diffoscope.comparators
+from diffoscope.comparators.binary import \
File, compare_binary_files
-from debbindiff.difference import Difference
-from debbindiff import logger, RequiredToolNotFound
+from diffoscope.difference import Difference
+from diffoscope import logger, RequiredToolNotFound
@contextmanager
def make_temp_directory():
- temp_dir = tempfile.mkdtemp(suffix='debbindiff')
+ temp_dir = tempfile.mkdtemp(suffix='diffoscope')
try:
yield temp_dir
finally:
@@ -176,12 +176,12 @@ class Container(object):
my_file = self.get_member(name)
other_file = other.get_member(name)
differences.append(
- debbindiff.comparators.compare_files(
+ diffoscope.comparators.compare_files(
my_file, other_file, source=name))
my_extra_files = map(self.get_member, my_names.difference(other_names))
other_extra_files = map(other.get_member, other_names.difference(my_names))
- for my_file, other_file, similarity in debbindiff.comparators.perform_fuzzy_matching(my_extra_files, other_extra_files):
- difference = debbindiff.comparators.compare_files(my_file, other_file)
+ for my_file, other_file, similarity in diffoscope.comparators.perform_fuzzy_matching(my_extra_files, other_extra_files):
+ difference = diffoscope.comparators.compare_files(my_file, other_file)
if difference is None:
difference = Difference(None, my_file.name, other_file.name)
difference.add_comment(
diff --git a/debbindiff/comparators/xz.py b/diffoscope/comparators/xz.py
similarity index 78%
rename from debbindiff/comparators/xz.py
rename to diffoscope/comparators/xz.py
index 6abb909..b222a19 100644
--- a/debbindiff/comparators/xz.py
+++ b/diffoscope/comparators/xz.py
@@ -1,31 +1,31 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from contextlib import contextmanager
import os.path
import re
import subprocess
-import debbindiff.comparators
-from debbindiff import tool_required
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.comparators.utils import Archive, get_compressed_content_name
-from debbindiff import logger, tool_required
+import diffoscope.comparators
+from diffoscope import tool_required
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.comparators.utils import Archive, get_compressed_content_name
+from diffoscope import logger, tool_required
class XzContainer(Archive):
@@ -59,7 +59,7 @@ class XzContainer(Archive):
source = None
if my_file.name == other_file.name:
source = my_file.name
- return [debbindiff.comparators.compare_files(my_file, other_file, source)]
+ return [diffoscope.comparators.compare_files(my_file, other_file, source)]
class XzFile(File):
diff --git a/debbindiff/comparators/zip.py b/diffoscope/comparators/zip.py
similarity index 83%
rename from debbindiff/comparators/zip.py
rename to diffoscope/comparators/zip.py
index c1befa1..c2077f8 100644
--- a/debbindiff/comparators/zip.py
+++ b/diffoscope/comparators/zip.py
@@ -1,33 +1,33 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import os.path
import re
import subprocess
import zipfile
-from debbindiff import logger
-from debbindiff.difference import Difference
-import debbindiff.comparators
-from debbindiff import tool_required
-from debbindiff.comparators.binary import File, needs_content
-from debbindiff.comparators.directory import Directory
-from debbindiff.comparators.utils import Archive, ArchiveMember, Command
+from diffoscope import logger
+from diffoscope.difference import Difference
+import diffoscope.comparators
+from diffoscope import tool_required
+from diffoscope.comparators.binary import File, needs_content
+from diffoscope.comparators.directory import Directory
+from diffoscope.comparators.utils import Archive, ArchiveMember, Command
class Zipinfo(Command):
diff --git a/debbindiff/difference.py b/diffoscope/difference.py
similarity index 96%
rename from debbindiff/difference.py
rename to diffoscope/difference.py
index 7950da0..7c67c57 100644
--- a/debbindiff/difference.py
+++ b/diffoscope/difference.py
@@ -1,21 +1,21 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
-# Copyright © 2014 Jérémy Bobbio <lunar at debian.org>
+# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from contextlib import contextmanager
import os
@@ -29,7 +29,7 @@ import traceback
from StringIO import StringIO
from threading import Thread
from multiprocessing import Queue
-from debbindiff import logger, tool_required, RequiredToolNotFound
+from diffoscope import logger, tool_required, RequiredToolNotFound
MAX_DIFF_BLOCK_LINES = 50
diff --git a/debbindiff/presenters/__init__.py b/diffoscope/presenters/__init__.py
similarity index 100%
rename from debbindiff/presenters/__init__.py
rename to diffoscope/presenters/__init__.py
diff --git a/debbindiff/presenters/html.py b/diffoscope/presenters/html.py
similarity index 96%
rename from debbindiff/presenters/html.py
rename to diffoscope/presenters/html.py
index 6cc691c..cc5e91b 100644
--- a/debbindiff/presenters/html.py
+++ b/diffoscope/presenters/html.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
# © 2015 Reiner Herrmann <reiner at reiner-h.de>
@@ -10,18 +10,18 @@
# © 2012 scito <info at scito.ch>
#
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
#
#
# Most of the code is borrowed from diff2html.py available at:
@@ -39,8 +39,8 @@ import subprocess
import sys
from tempfile import NamedTemporaryFile
from xml.sax.saxutils import escape
-from debbindiff import logger, VERSION
-from debbindiff.comparators.utils import make_temp_directory
+from diffoscope import logger, VERSION
+from diffoscope.comparators.utils import make_temp_directory
# minimum line size, we add a zero-sized breakable space every
# LINESIZE characters
@@ -59,7 +59,7 @@ HEADER = """
<html>
<head>
<meta charset="utf-8">
- <meta name="generator" content="debbindiff">
+ <meta name="generator" content="diffoscope">
<title>%(title)s</title>
<style>
body {
@@ -147,7 +147,7 @@ HEADER = """
"""
FOOTER = """
-<div class="footer">Generated by debbindiff %(version)s</div>
+<div class="footer">Generated by diffoscope %(version)s</div>
</body>
</html>
"""
diff --git a/debbindiff/presenters/text.py b/diffoscope/presenters/text.py
similarity index 86%
rename from debbindiff/presenters/text.py
rename to diffoscope/presenters/text.py
index 2b057ce..01715d4 100644
--- a/debbindiff/presenters/text.py
+++ b/diffoscope/presenters/text.py
@@ -1,28 +1,28 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
# 2015 Helmut Grohne <helmut at subdivi.de>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import sys
import difflib
import locale
-from debbindiff import logger
+from diffoscope import logger
def print_difference(difference, print_func):
diff --git a/setup.py b/setup.py
index 41aee26..7ffac88 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
from setuptools import setup, find_packages
from setuptools.command.test import test as TestCommand
-import debbindiff
+import diffoscope
class PyTest(TestCommand):
user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]
@@ -22,8 +22,8 @@ class PyTest(TestCommand):
errno = pytest.main(self.pytest_args)
sys.exit(errno)
-setup(name='debbindiff',
- version=debbindiff.VERSION,
+setup(name='diffoscope',
+ version=diffoscope.VERSION,
description='display differences between files',
long_description=open('README').read(),
author='Lunar',
@@ -32,7 +32,7 @@ setup(name='debbindiff',
packages=find_packages(),
tests_require=['pytest'],
cmdclass = {'test': PyTest},
- scripts=['debbindiff.py'],
+ scripts=['diffoscope.py'],
install_requires=[
'python-debian',
'magic',
diff --git a/tests/comparators/conftest.py b/tests/comparators/conftest.py
index 51aa2cb..267cb36 100644
--- a/tests/comparators/conftest.py
+++ b/tests/comparators/conftest.py
@@ -1,30 +1,30 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from distutils.spawn import find_executable
-import debbindiff
+import diffoscope
import pytest
@pytest.fixture(autouse=True)
def set_locale():
- debbindiff.set_locale()
+ diffoscope.set_locale()
def tool_missing(cmd):
diff --git a/tests/comparators/test_binary.py b/tests/comparators/test_binary.py
index 00b84b5..ebf2cca 100644
--- a/tests/comparators/test_binary.py
+++ b/tests/comparators/test_binary.py
@@ -1,32 +1,32 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import os.path
import shutil
import subprocess
import pytest
-from debbindiff.comparators import specialize
-import debbindiff.comparators.binary
-from debbindiff.comparators.binary import File, FilesystemFile
-from debbindiff.difference import Difference
-from debbindiff import RequiredToolNotFound, tool_required
+from diffoscope.comparators import specialize
+import diffoscope.comparators.binary
+from diffoscope.comparators.binary import File, FilesystemFile
+from diffoscope.difference import Difference
+from diffoscope import RequiredToolNotFound, tool_required
TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/binary1')
TEST_FILE2_PATH = os.path.join(os.path.dirname(__file__), '../data/binary2')
@@ -76,7 +76,7 @@ def test_compare_with_xxd(binary1, binary2):
def xxd_not_found(monkeypatch):
def mock_xxd(path):
raise RequiredToolNotFound('xxd')
- monkeypatch.setattr(debbindiff.comparators.binary, 'xxd', mock_xxd)
+ monkeypatch.setattr(diffoscope.comparators.binary, 'xxd', mock_xxd)
def test_no_differences_without_xxd(xxd_not_found, binary1):
difference = binary1.compare_bytes(binary1)
@@ -124,7 +124,7 @@ def test_with_compare_details_and_failed_process():
assert difference.unified_diff == expected_diff
def test_with_compare_details_and_tool_not_found(monkeypatch):
- monkeypatch.setattr('debbindiff.RequiredToolNotFound.get_package', lambda _: 'some-package')
+ monkeypatch.setattr('diffoscope.RequiredToolNotFound.get_package', lambda _: 'some-package')
class MockFile(FilesystemFile):
@tool_required('nonexistent')
def compare_details(self, other, source=None):
diff --git a/tests/comparators/test_bzip2.py b/tests/comparators/test_bzip2.py
index c59b616..fe38502 100644
--- a/tests/comparators/test_bzip2.py
+++ b/tests/comparators/test_bzip2.py
@@ -1,29 +1,29 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import os.path
import shutil
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.bzip2 import Bzip2File
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.bzip2 import Bzip2File
TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/test1.bz2')
TEST_FILE2_PATH = os.path.join(os.path.dirname(__file__), '../data/test2.bz2')
diff --git a/tests/comparators/test_cpio.py b/tests/comparators/test_cpio.py
index 743cd1e..33d3546 100644
--- a/tests/comparators/test_cpio.py
+++ b/tests/comparators/test_cpio.py
@@ -1,30 +1,30 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import codecs
import os.path
import shutil
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.cpio import CpioFile
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.cpio import CpioFile
TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/test1.cpio')
TEST_FILE2_PATH = os.path.join(os.path.dirname(__file__), '../data/test2.cpio')
diff --git a/tests/comparators/test_deb.py b/tests/comparators/test_deb.py
index 689296e..223fecb 100644
--- a/tests/comparators/test_deb.py
+++ b/tests/comparators/test_deb.py
@@ -1,31 +1,31 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import codecs
import os.path
import shutil
import pytest
-import debbindiff.comparators
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.deb import DebFile, Md5sumsFile, DebDataTarFile
+import diffoscope.comparators
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.deb import DebFile, Md5sumsFile, DebDataTarFile
TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/test1.deb')
TEST_FILE2_PATH = os.path.join(os.path.dirname(__file__), '../data/test2.deb')
@@ -99,10 +99,10 @@ def test_identification_of_data_tar(deb1, deb2, monkeypatch):
def test_skip_comparison_of_known_identical_files(deb1, deb2, monkeypatch):
compared = set()
- orig_func = debbindiff.comparators.compare_files
+ orig_func = diffoscope.comparators.compare_files
def probe(file1, file2, source=None):
compared.add(file1.name)
return orig_func(file1, file2, source=None)
- monkeypatch.setattr(debbindiff.comparators, 'compare_files', probe)
+ monkeypatch.setattr(diffoscope.comparators, 'compare_files', probe)
deb1.compare(deb2)
assert './usr/share/doc/test/README.Debian' not in compared
diff --git a/tests/comparators/test_debian.py b/tests/comparators/test_debian.py
index d946b92..215f7ed 100644
--- a/tests/comparators/test_debian.py
+++ b/tests/comparators/test_debian.py
@@ -1,32 +1,32 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
import os.path
import shutil
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.debian import DotChangesFile
-from debbindiff.presenters.text import output_text
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.debian import DotChangesFile
+from diffoscope.presenters.text import output_text
TEST_DOT_CHANGES_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/test1.changes')
TEST_DOT_CHANGES_FILE2_PATH = os.path.join(os.path.dirname(__file__), '../data/test2.changes')
diff --git a/tests/comparators/test_directory.py b/tests/comparators/test_directory.py
index 25be7e2..7f54b76 100644
--- a/tests/comparators/test_directory.py
+++ b/tests/comparators/test_directory.py
@@ -1,22 +1,22 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
@@ -24,9 +24,9 @@ import os
import os.path
import shutil
import pytest
-import debbindiff.comparators.binary
-from debbindiff.comparators.directory import compare_directories
-from debbindiff.presenters.text import output_text
+import diffoscope.comparators.binary
+from diffoscope.comparators.directory import compare_directories
+from diffoscope.presenters.text import output_text
TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/text_ascii1')
TEST_FILE2_PATH = os.path.join(os.path.dirname(__file__), '../data/text_ascii2')
diff --git a/tests/comparators/test_elf.py b/tests/comparators/test_elf.py
index 08a09cf..fbc8c3a 100644
--- a/tests/comparators/test_elf.py
+++ b/tests/comparators/test_elf.py
@@ -1,29 +1,29 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import os.path
import shutil
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.elf import ElfFile, StaticLibFile
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.elf import ElfFile, StaticLibFile
TEST_OBJ1_PATH = os.path.join(os.path.dirname(__file__), '../data/test1.o')
TEST_OBJ2_PATH = os.path.join(os.path.dirname(__file__), '../data/test2.o')
diff --git a/tests/comparators/test_fonts.py b/tests/comparators/test_fonts.py
index 3a12132..0000e5a 100644
--- a/tests/comparators/test_fonts.py
+++ b/tests/comparators/test_fonts.py
@@ -1,29 +1,29 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import os.path
import shutil
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.fonts import TtfFile
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.fonts import TtfFile
from conftest import tool_missing
TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/Samyak-Malayalam1.ttf')
diff --git a/tests/comparators/test_gettext.py b/tests/comparators/test_gettext.py
index ce32210..7898561 100644
--- a/tests/comparators/test_gettext.py
+++ b/tests/comparators/test_gettext.py
@@ -1,30 +1,30 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import codecs
import os.path
import shutil
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.gettext import MoFile
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.gettext import MoFile
TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/test1.mo')
TEST_FILE2_PATH = os.path.join(os.path.dirname(__file__), '../data/test2.mo')
diff --git a/tests/comparators/test_gzip.py b/tests/comparators/test_gzip.py
index f6c867f..fdde2ca 100644
--- a/tests/comparators/test_gzip.py
+++ b/tests/comparators/test_gzip.py
@@ -1,29 +1,29 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import os.path
import shutil
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.gzip import GzipFile
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.gzip import GzipFile
TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/test1.gz')
TEST_FILE2_PATH = os.path.join(os.path.dirname(__file__), '../data/test2.gz')
diff --git a/tests/comparators/test_ipk.py b/tests/comparators/test_ipk.py
index e6f7ea6..66f599c 100644
--- a/tests/comparators/test_ipk.py
+++ b/tests/comparators/test_ipk.py
@@ -1,30 +1,30 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import codecs
import os.path
import shutil
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.ipk import IpkFile
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.ipk import IpkFile
TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/base-files_157-r45695_ar71xx.ipk')
TEST_FILE2_PATH = os.path.join(os.path.dirname(__file__), '../data/base-files_157-r45918_ar71xx.ipk')
diff --git a/tests/comparators/test_iso9660.py b/tests/comparators/test_iso9660.py
index ba37410..7bd5fc5 100644
--- a/tests/comparators/test_iso9660.py
+++ b/tests/comparators/test_iso9660.py
@@ -1,30 +1,30 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import codecs
import os.path
import shutil
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.iso9660 import Iso9660File
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.iso9660 import Iso9660File
from conftest import tool_missing
TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/test1.iso')
diff --git a/tests/comparators/test_java.py b/tests/comparators/test_java.py
index 355de5b..2c311a2 100644
--- a/tests/comparators/test_java.py
+++ b/tests/comparators/test_java.py
@@ -1,29 +1,29 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import os.path
import shutil
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.java import ClassFile
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.java import ClassFile
TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/Test1.class')
TEST_FILE2_PATH = os.path.join(os.path.dirname(__file__), '../data/Test2.class')
diff --git a/tests/comparators/test_mono.py b/tests/comparators/test_mono.py
index 775eaf4..6f74ac3 100644
--- a/tests/comparators/test_mono.py
+++ b/tests/comparators/test_mono.py
@@ -1,29 +1,29 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import os.path
import shutil
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.mono import MonoExeFile
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.mono import MonoExeFile
from conftest import tool_missing
# these were generated with:
diff --git a/tests/comparators/test_pdf.py b/tests/comparators/test_pdf.py
index f57e762..4e28524 100644
--- a/tests/comparators/test_pdf.py
+++ b/tests/comparators/test_pdf.py
@@ -1,29 +1,29 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import os.path
import shutil
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.pdf import PdfFile
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.pdf import PdfFile
from conftest import tool_missing
TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/test1.pdf')
diff --git a/tests/comparators/test_png.py b/tests/comparators/test_png.py
index f40f5ae..29ae171 100644
--- a/tests/comparators/test_png.py
+++ b/tests/comparators/test_png.py
@@ -1,29 +1,29 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import os.path
import shutil
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.png import PngFile
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.png import PngFile
from conftest import tool_missing
TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/test1.png')
diff --git a/tests/comparators/test_rpm.py b/tests/comparators/test_rpm.py
index 058abc2..fcb3a9d 100644
--- a/tests/comparators/test_rpm.py
+++ b/tests/comparators/test_rpm.py
@@ -1,30 +1,30 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import codecs
import os.path
import shutil
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.rpm import RpmFile
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.rpm import RpmFile
from conftest import tool_missing
TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/test1.rpm')
diff --git a/tests/comparators/test_sqlite.py b/tests/comparators/test_sqlite.py
index 1bf0969..0bb97b7 100644
--- a/tests/comparators/test_sqlite.py
+++ b/tests/comparators/test_sqlite.py
@@ -1,29 +1,29 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import os.path
import shutil
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.sqlite import Sqlite3Database
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.sqlite import Sqlite3Database
from conftest import tool_missing
TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/test1.sqlite3')
diff --git a/tests/comparators/test_squashfs.py b/tests/comparators/test_squashfs.py
index 7e60af9..37372b8 100644
--- a/tests/comparators/test_squashfs.py
+++ b/tests/comparators/test_squashfs.py
@@ -1,31 +1,31 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import codecs
import os.path
import pwd
import shutil
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.squashfs import SquashfsFile
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.squashfs import SquashfsFile
from conftest import tool_missing
TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/test1.squashfs')
diff --git a/tests/comparators/test_tar.py b/tests/comparators/test_tar.py
index a6362f7..bb69ebc 100644
--- a/tests/comparators/test_tar.py
+++ b/tests/comparators/test_tar.py
@@ -1,30 +1,30 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import codecs
import os.path
import shutil
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.tar import TarFile
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.tar import TarFile
TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/test1.tar')
TEST_FILE2_PATH = os.path.join(os.path.dirname(__file__), '../data/test2.tar')
diff --git a/tests/comparators/test_text.py b/tests/comparators/test_text.py
index bd349e5..c61a27a 100644
--- a/tests/comparators/test_text.py
+++ b/tests/comparators/test_text.py
@@ -1,29 +1,29 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import codecs
import os.path
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.text import TextFile
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.text import TextFile
@pytest.fixture
def ascii1():
diff --git a/tests/comparators/test_utils.py b/tests/comparators/test_utils.py
index 301db8a..6e89d76 100644
--- a/tests/comparators/test_utils.py
+++ b/tests/comparators/test_utils.py
@@ -1,29 +1,29 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import codecs
import os.path
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.text import TextFile
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.text import TextFile
@pytest.fixture
def fuzzy_tar1():
diff --git a/tests/comparators/test_xz.py b/tests/comparators/test_xz.py
index 6e81af3..fde39f6 100644
--- a/tests/comparators/test_xz.py
+++ b/tests/comparators/test_xz.py
@@ -1,29 +1,29 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import os.path
import shutil
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.xz import XzFile
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.xz import XzFile
TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/test1.xz')
TEST_FILE2_PATH = os.path.join(os.path.dirname(__file__), '../data/test2.xz')
diff --git a/tests/comparators/test_zip.py b/tests/comparators/test_zip.py
index 867852d..65389c5 100644
--- a/tests/comparators/test_zip.py
+++ b/tests/comparators/test_zip.py
@@ -1,30 +1,30 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# debbindiff: highlight differences between two builds of Debian packages
+# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
#
-# debbindiff is free software: you can redistribute it and/or modify
+# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# debbindiff is distributed in the hope that it will be useful,
+# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with debbindiff. If not, see <http://www.gnu.org/licenses/>.
+# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import codecs
import os.path
import shutil
import pytest
-from debbindiff.comparators import specialize
-from debbindiff.comparators.binary import FilesystemFile
-from debbindiff.comparators.zip import ZipFile
+from diffoscope.comparators import specialize
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.zip import ZipFile
from conftest import tool_missing
TEST_FILE1_PATH = os.path.join(os.path.dirname(__file__), '../data/test1.zip')
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git
More information about the Reproducible-commits
mailing list