[diffoscope] 01/01: diffoscope.comparators: File has moved to utils.file

Chris Lamb chris at chris-lamb.co.uk
Wed Dec 28 19:47:08 CET 2016


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

lamby pushed a commit to branch master
in repository diffoscope.

commit bfe453e9b51f39b7ddaeca1ac17c25b266ddb578
Author: Chris Lamb <lamby at debian.org>
Date:   Wed Dec 28 18:46:48 2016 +0000

    diffoscope.comparators: File has moved to utils.file
    
    Signed-off-by: Chris Lamb <lamby at debian.org>
---
 diffoscope/comparators/apk.py          | 2 +-
 diffoscope/comparators/ar.py           | 2 +-
 diffoscope/comparators/cbfs.py         | 2 +-
 diffoscope/comparators/cpio.py         | 2 +-
 diffoscope/comparators/debian.py       | 2 +-
 diffoscope/comparators/device.py       | 3 ++-
 diffoscope/comparators/dex.py          | 2 +-
 diffoscope/comparators/elf.py          | 2 +-
 diffoscope/comparators/fonts.py        | 2 +-
 diffoscope/comparators/fsimage.py      | 2 +-
 diffoscope/comparators/gettext.py      | 2 +-
 diffoscope/comparators/git.py          | 2 +-
 diffoscope/comparators/haskell.py      | 2 +-
 diffoscope/comparators/icc.py          | 2 +-
 diffoscope/comparators/image.py        | 2 +-
 diffoscope/comparators/iso9660.py      | 2 +-
 diffoscope/comparators/java.py         | 2 +-
 diffoscope/comparators/json.py         | 2 +-
 diffoscope/comparators/llvm.py         | 2 +-
 diffoscope/comparators/macho.py        | 2 +-
 diffoscope/comparators/mono.py         | 2 +-
 diffoscope/comparators/openssh.py      | 2 +-
 diffoscope/comparators/pdf.py          | 2 +-
 diffoscope/comparators/png.py          | 2 +-
 diffoscope/comparators/ppu.py          | 2 +-
 diffoscope/comparators/rpm_fallback.py | 2 +-
 diffoscope/comparators/sqlite.py       | 2 +-
 diffoscope/comparators/squashfs.py     | 2 +-
 diffoscope/comparators/symlink.py      | 2 +-
 diffoscope/comparators/tar.py          | 2 +-
 diffoscope/comparators/text.py         | 2 +-
 diffoscope/comparators/xz.py           | 2 +-
 diffoscope/comparators/zip.py          | 2 +-
 33 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/diffoscope/comparators/apk.py b/diffoscope/comparators/apk.py
index 9140fce..f9f6613 100644
--- a/diffoscope/comparators/apk.py
+++ b/diffoscope/comparators/apk.py
@@ -25,7 +25,7 @@ from diffoscope.tools import tool_required
 from diffoscope.logging import logger
 from diffoscope.tempfiles import get_temporary_directory
 
-from .binary import File
+from .utils.file import File
 from .utils.archive import Archive
 
 class ApkContainer(Archive):
diff --git a/diffoscope/comparators/ar.py b/diffoscope/comparators/ar.py
index 9c5f409..dfb6665 100644
--- a/diffoscope/comparators/ar.py
+++ b/diffoscope/comparators/ar.py
@@ -24,7 +24,7 @@ from diffoscope.tools import tool_required
 from diffoscope.logging import logger
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.command import Command
 from .utils.libarchive import LibarchiveContainer, list_libarchive
 
diff --git a/diffoscope/comparators/cbfs.py b/diffoscope/comparators/cbfs.py
index 6671d06..ee48769 100644
--- a/diffoscope/comparators/cbfs.py
+++ b/diffoscope/comparators/cbfs.py
@@ -27,7 +27,7 @@ from diffoscope.tools import tool_required
 from diffoscope.logging import logger
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.archive import Archive
 from .utils.command import Command
 
diff --git a/diffoscope/comparators/cpio.py b/diffoscope/comparators/cpio.py
index cb0f458..db52afd 100644
--- a/diffoscope/comparators/cpio.py
+++ b/diffoscope/comparators/cpio.py
@@ -23,7 +23,7 @@ import re
 from diffoscope.tools import tool_required
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.command import Command
 from .utils.libarchive import LibarchiveContainer, list_libarchive
 
diff --git a/diffoscope/comparators/debian.py b/diffoscope/comparators/debian.py
index f7e44c7..b42bb0a 100644
--- a/diffoscope/comparators/debian.py
+++ b/diffoscope/comparators/debian.py
@@ -29,7 +29,7 @@ from diffoscope.logging import logger
 from diffoscope.changes import Changes
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.container import Container
 
 
diff --git a/diffoscope/comparators/device.py b/diffoscope/comparators/device.py
index 974e4a7..273e28a 100644
--- a/diffoscope/comparators/device.py
+++ b/diffoscope/comparators/device.py
@@ -23,7 +23,8 @@ import stat
 from diffoscope.tempfiles import get_named_temporary_file
 from diffoscope.difference import Difference
 
-from .binary import File, FilesystemFile
+from .binary import FilesystemFile
+from .utils.file import File
 
 
 class Device(File):
diff --git a/diffoscope/comparators/dex.py b/diffoscope/comparators/dex.py
index c3dc122..966d3f5 100644
--- a/diffoscope/comparators/dex.py
+++ b/diffoscope/comparators/dex.py
@@ -25,7 +25,7 @@ import collections
 from diffoscope.tools import tool_required
 from diffoscope.logging import logger
 
-from .binary import File
+from .utils.file import File
 from .utils.archive import Archive
 from .utils.filenames import get_compressed_content_name
 
diff --git a/diffoscope/comparators/elf.py b/diffoscope/comparators/elf.py
index 699146d..d650ead 100644
--- a/diffoscope/comparators/elf.py
+++ b/diffoscope/comparators/elf.py
@@ -29,7 +29,7 @@ from diffoscope.tempfiles import get_named_temporary_file
 from diffoscope.difference import Difference
 
 from .deb import DebFile, get_build_id_map
-from .binary import File
+from .utils.file import File
 from .utils.command import Command
 from .utils.container import  Container
 from .utils.libarchive import list_libarchive
diff --git a/diffoscope/comparators/fonts.py b/diffoscope/comparators/fonts.py
index 5fa4f81..e5fbea0 100644
--- a/diffoscope/comparators/fonts.py
+++ b/diffoscope/comparators/fonts.py
@@ -22,7 +22,7 @@ import re
 from diffoscope.tools import tool_required
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.command import Command
 
 
diff --git a/diffoscope/comparators/fsimage.py b/diffoscope/comparators/fsimage.py
index 5db035b..e6ad952 100644
--- a/diffoscope/comparators/fsimage.py
+++ b/diffoscope/comparators/fsimage.py
@@ -24,7 +24,7 @@ import collections
 from diffoscope.logging import logger
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.archive import Archive
 
 try:
diff --git a/diffoscope/comparators/gettext.py b/diffoscope/comparators/gettext.py
index 7bd34fd..c6a75a7 100644
--- a/diffoscope/comparators/gettext.py
+++ b/diffoscope/comparators/gettext.py
@@ -24,7 +24,7 @@ from diffoscope.tools import tool_required
 from diffoscope.logging import logger
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.command import Command
 
 
diff --git a/diffoscope/comparators/git.py b/diffoscope/comparators/git.py
index 99e5f5e..0f49889 100644
--- a/diffoscope/comparators/git.py
+++ b/diffoscope/comparators/git.py
@@ -24,7 +24,7 @@ import binascii
 
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 
 
 class GitIndexFile(File):
diff --git a/diffoscope/comparators/haskell.py b/diffoscope/comparators/haskell.py
index c0360c8..8213447 100644
--- a/diffoscope/comparators/haskell.py
+++ b/diffoscope/comparators/haskell.py
@@ -27,7 +27,7 @@ from diffoscope.logging import logger
 from diffoscope.profiling import profile
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.command import Command
 
 
diff --git a/diffoscope/comparators/icc.py b/diffoscope/comparators/icc.py
index 180d809..c0d6999 100644
--- a/diffoscope/comparators/icc.py
+++ b/diffoscope/comparators/icc.py
@@ -22,7 +22,7 @@ import re
 from diffoscope.tools import tool_required
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.command import Command
 
 
diff --git a/diffoscope/comparators/image.py b/diffoscope/comparators/image.py
index 293887c..bf5e745 100644
--- a/diffoscope/comparators/image.py
+++ b/diffoscope/comparators/image.py
@@ -22,7 +22,7 @@ import re
 from diffoscope.tools import tool_required
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.command import Command
 
 re_ansi_escapes = re.compile(r'\x1b[^m]*m')
diff --git a/diffoscope/comparators/iso9660.py b/diffoscope/comparators/iso9660.py
index 22756c0..bc47540 100644
--- a/diffoscope/comparators/iso9660.py
+++ b/diffoscope/comparators/iso9660.py
@@ -23,7 +23,7 @@ import subprocess
 from diffoscope.tools import tool_required
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.command import Command
 from .utils.libarchive import LibarchiveContainer
 
diff --git a/diffoscope/comparators/java.py b/diffoscope/comparators/java.py
index af39306..b91bd25 100644
--- a/diffoscope/comparators/java.py
+++ b/diffoscope/comparators/java.py
@@ -24,7 +24,7 @@ import os.path
 from diffoscope.tools import tool_required
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.command import Command
 
 
diff --git a/diffoscope/comparators/json.py b/diffoscope/comparators/json.py
index 7f1a340..d46c830 100644
--- a/diffoscope/comparators/json.py
+++ b/diffoscope/comparators/json.py
@@ -23,7 +23,7 @@ import collections
 
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 
 
 class JSONFile(File):
diff --git a/diffoscope/comparators/llvm.py b/diffoscope/comparators/llvm.py
index bc44844..8c0fa69 100644
--- a/diffoscope/comparators/llvm.py
+++ b/diffoscope/comparators/llvm.py
@@ -21,7 +21,7 @@
 from diffoscope.tools import tool_required
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.command import Command
 
 
diff --git a/diffoscope/comparators/macho.py b/diffoscope/comparators/macho.py
index d3b0db3..ee38d76 100644
--- a/diffoscope/comparators/macho.py
+++ b/diffoscope/comparators/macho.py
@@ -24,7 +24,7 @@ import subprocess
 from diffoscope.tools import tool_required
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.command import Command
 
 
diff --git a/diffoscope/comparators/mono.py b/diffoscope/comparators/mono.py
index 4236de0..2a04a25 100644
--- a/diffoscope/comparators/mono.py
+++ b/diffoscope/comparators/mono.py
@@ -23,7 +23,7 @@ import re
 from diffoscope.tools import tool_required
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.command import Command
 
 
diff --git a/diffoscope/comparators/openssh.py b/diffoscope/comparators/openssh.py
index 8bb3df0..9133088 100644
--- a/diffoscope/comparators/openssh.py
+++ b/diffoscope/comparators/openssh.py
@@ -22,7 +22,7 @@ import re
 from diffoscope.tools import tool_required
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.command import Command
 
 
diff --git a/diffoscope/comparators/pdf.py b/diffoscope/comparators/pdf.py
index a400e43..ea114dc 100644
--- a/diffoscope/comparators/pdf.py
+++ b/diffoscope/comparators/pdf.py
@@ -22,7 +22,7 @@ import re
 from diffoscope.tools import tool_required
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.command import Command
 
 
diff --git a/diffoscope/comparators/png.py b/diffoscope/comparators/png.py
index d51fa17..3d0918c 100644
--- a/diffoscope/comparators/png.py
+++ b/diffoscope/comparators/png.py
@@ -23,7 +23,7 @@ import functools
 from diffoscope.tools import tool_required
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.command import Command
 
 
diff --git a/diffoscope/comparators/ppu.py b/diffoscope/comparators/ppu.py
index ab6a057..21219e1 100644
--- a/diffoscope/comparators/ppu.py
+++ b/diffoscope/comparators/ppu.py
@@ -28,7 +28,7 @@ from diffoscope.logging import logger
 from diffoscope.profiling import profile
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.command import Command
 
 
diff --git a/diffoscope/comparators/rpm_fallback.py b/diffoscope/comparators/rpm_fallback.py
index 22b3e74..15fd31b 100644
--- a/diffoscope/comparators/rpm_fallback.py
+++ b/diffoscope/comparators/rpm_fallback.py
@@ -19,7 +19,7 @@
 
 import re
 
-from .binary import File
+from .utils.file import File
 
 
 class AbstractRpmFile(File):
diff --git a/diffoscope/comparators/sqlite.py b/diffoscope/comparators/sqlite.py
index eb9823c..d49f7f7 100644
--- a/diffoscope/comparators/sqlite.py
+++ b/diffoscope/comparators/sqlite.py
@@ -20,7 +20,7 @@
 from diffoscope.tools import tool_required
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.command import Command
 
 
diff --git a/diffoscope/comparators/squashfs.py b/diffoscope/comparators/squashfs.py
index a5ba6f7..97ff7b8 100644
--- a/diffoscope/comparators/squashfs.py
+++ b/diffoscope/comparators/squashfs.py
@@ -27,7 +27,7 @@ from diffoscope.tools import tool_required
 from diffoscope.logging import logger
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .device import Device
 from .symlink import Symlink
 from .directory import Directory
diff --git a/diffoscope/comparators/symlink.py b/diffoscope/comparators/symlink.py
index 1e6d2e1..3486351 100644
--- a/diffoscope/comparators/symlink.py
+++ b/diffoscope/comparators/symlink.py
@@ -23,7 +23,7 @@ from diffoscope.logging import logger
 from diffoscope.tempfiles import get_named_temporary_file
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 
 
 class Symlink(File):
diff --git a/diffoscope/comparators/tar.py b/diffoscope/comparators/tar.py
index dd9584f..49dfcb0 100644
--- a/diffoscope/comparators/tar.py
+++ b/diffoscope/comparators/tar.py
@@ -21,7 +21,7 @@ import re
 
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .utils.libarchive import LibarchiveContainer, list_libarchive
 
 class TarContainer(LibarchiveContainer):
diff --git a/diffoscope/comparators/text.py b/diffoscope/comparators/text.py
index 8d59dc6..607e495 100644
--- a/diffoscope/comparators/text.py
+++ b/diffoscope/comparators/text.py
@@ -22,7 +22,7 @@ import codecs
 
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 
 
 def order_only_difference(unified_diff):
diff --git a/diffoscope/comparators/xz.py b/diffoscope/comparators/xz.py
index 67e2d81..0917a30 100644
--- a/diffoscope/comparators/xz.py
+++ b/diffoscope/comparators/xz.py
@@ -25,7 +25,7 @@ import collections
 from diffoscope.tools import tool_required
 from diffoscope.logging import logger
 
-from .binary import File
+from .utils.file import File
 from .utils.archive import Archive
 from .utils.filenames import get_compressed_content_name
 
diff --git a/diffoscope/comparators/zip.py b/diffoscope/comparators/zip.py
index ec8b6fd..46f1881 100644
--- a/diffoscope/comparators/zip.py
+++ b/diffoscope/comparators/zip.py
@@ -27,7 +27,7 @@ import contextlib
 from diffoscope.tools import tool_required
 from diffoscope.difference import Difference
 
-from .binary import File
+from .utils.file import File
 from .directory import Directory
 from .utils.archive import Archive, ArchiveMember
 from .utils.command import Command

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


More information about the diffoscope mailing list