[diffoscope] 01/05: diffoscope/comparators: Move libarchive to utils package.

[Chris Lamb]

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

lamby pushed a commit to branch master
in repository diffoscope.

commit 8d03252ed9c4879f465bca4163f4af8d730ebcdb
Author: Chris Lamb <lamby at debian.org>
Date:   Tue Dec 27 14:36:08 2016 +0000

    diffoscope/comparators: Move libarchive to utils package.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>
---
 diffoscope/comparators/ar.py                     | 3 +--
 diffoscope/comparators/cpio.py                   | 2 +-
 diffoscope/comparators/deb.py                    | 2 +-
 diffoscope/comparators/elf.py                    | 2 +-
 diffoscope/comparators/iso9660.py                | 2 +-
 diffoscope/comparators/tar.py                    | 2 +-
 diffoscope/comparators/{ => utils}/libarchive.py | 9 +++++----
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/diffoscope/comparators/ar.py b/diffoscope/comparators/ar.py
index c80d155..6c3ad83 100644
--- a/diffoscope/comparators/ar.py
+++ b/diffoscope/comparators/ar.py
@@ -25,8 +25,7 @@ from diffoscope.difference import Difference
 
 from .utils import Command
 from .binary import File
-from .libarchive import LibarchiveContainer, \
-    list_libarchive
+from .utils.libarchive import LibarchiveContainer, list_libarchive
 
 
 # TODO: this would also be useful for Go archives. Currently those are handled
diff --git a/diffoscope/comparators/cpio.py b/diffoscope/comparators/cpio.py
index 1048c26..f5060c6 100644
--- a/diffoscope/comparators/cpio.py
+++ b/diffoscope/comparators/cpio.py
@@ -25,7 +25,7 @@ from diffoscope.difference import Difference
 
 from .utils import Command
 from .binary import File
-from .libarchive import LibarchiveContainer, list_libarchive
+from .utils.libarchive import LibarchiveContainer, list_libarchive
 
 
 class CpioContent(Command):
diff --git a/diffoscope/comparators/deb.py b/diffoscope/comparators/deb.py
index d860b22..b77599c 100644
--- a/diffoscope/comparators/deb.py
+++ b/diffoscope/comparators/deb.py
@@ -26,7 +26,7 @@ from . import specialize
 from .tar import TarContainer
 from .utils import ArchiveMember
 from .binary import File
-from .libarchive import LibarchiveContainer, list_libarchive
+from .utils.libarchive import LibarchiveContainer, list_libarchive
 
 try:
     from debian import deb822
diff --git a/diffoscope/comparators/elf.py b/diffoscope/comparators/elf.py
index c5fd12b..927658e 100644
--- a/diffoscope/comparators/elf.py
+++ b/diffoscope/comparators/elf.py
@@ -29,7 +29,7 @@ from diffoscope.difference import Difference
 from .deb import DebFile, get_build_id_map
 from .utils import Command, Container
 from .binary import File
-from .libarchive import list_libarchive
+from .utils.libarchive import list_libarchive
 
 
 class Readelf(Command):
diff --git a/diffoscope/comparators/iso9660.py b/diffoscope/comparators/iso9660.py
index dfba4b9..c2bc6f6 100644
--- a/diffoscope/comparators/iso9660.py
+++ b/diffoscope/comparators/iso9660.py
@@ -25,7 +25,7 @@ from diffoscope.difference import Difference
 
 from .utils import Command
 from .binary import File
-from .libarchive import LibarchiveContainer
+from .utils.libarchive import LibarchiveContainer
 
 
 @tool_required('isoinfo')
diff --git a/diffoscope/comparators/tar.py b/diffoscope/comparators/tar.py
index 8e96ef9..dd9584f 100644
--- a/diffoscope/comparators/tar.py
+++ b/diffoscope/comparators/tar.py
@@ -22,7 +22,7 @@ import re
 from diffoscope.difference import Difference
 
 from .binary import File
-from .libarchive import LibarchiveContainer, list_libarchive
+from .utils.libarchive import LibarchiveContainer, list_libarchive
 
 class TarContainer(LibarchiveContainer):
     pass
diff --git a/diffoscope/comparators/libarchive.py b/diffoscope/comparators/utils/libarchive.py
similarity index 98%
rename from diffoscope/comparators/libarchive.py
rename to diffoscope/comparators/utils/libarchive.py
index 055cf04..14dcec1 100644
--- a/diffoscope/comparators/libarchive.py
+++ b/diffoscope/comparators/utils/libarchive.py
@@ -25,10 +25,11 @@ import libarchive
 
 from diffoscope import logger, get_temporary_directory
 
-from .utils import Archive, ArchiveMember
-from .device import Device
-from .symlink import Symlink
-from .directory import Directory
+from ..device import Device
+from ..symlink import Symlink
+from ..directory import Directory
+
+from . import Archive, ArchiveMember
 
 
 # Monkeypatch libarchive-c (<< 2.2)

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