Commit bfe453e9 authored by Chris Lamb's avatar Chris Lamb 💬

diffoscope.comparators: File has moved to utils.file

Signed-off-by: Chris Lamb's avatarChris Lamb <lamby@debian.org>
parent 0c245b59
......@@ -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):
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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):
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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:
......
......@@ -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
......
......@@ -24,7 +24,7 @@ import binascii
from diffoscope.difference import Difference
from .binary import File
from .utils.file import File
class GitIndexFile(File):
......
......@@ -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
......
......@@ -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
......
......@@ -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')
......
......@@ -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
......
......@@ -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
......
......@@ -23,7 +23,7 @@ import collections
from diffoscope.difference import Difference
from .binary import File
from .utils.file import File
class JSONFile(File):
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -19,7 +19,7 @@
import re
from .binary import File
from .utils.file import File
class AbstractRpmFile(File):
......
......@@ -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
......
......@@ -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
......
......@@ -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):
......
......@@ -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):
......
......@@ -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):
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment