[diffoscope] 02/04: Drop unused imports.
Chris Lamb
chris at chris-lamb.co.uk
Tue Aug 9 12:32:54 CEST 2016
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository diffoscope.
commit d2b859b9daecc87721af8cfb8d59d347f3dfabb3
Author: Chris Lamb <lamby at debian.org>
Date: Tue Aug 9 11:27:26 2016 +0100
Drop unused imports.
Signed-off-by: Chris Lamb <lamby at debian.org>
---
diffoscope/changes.py | 1 -
diffoscope/comparators/binary.py | 3 ---
diffoscope/comparators/bzip2.py | 3 +--
diffoscope/comparators/cbfs.py | 1 -
diffoscope/comparators/deb.py | 3 +--
diffoscope/comparators/debian.py | 8 ++------
diffoscope/comparators/device.py | 2 --
diffoscope/comparators/dex.py | 1 -
diffoscope/comparators/directory.py | 1 -
diffoscope/comparators/fsimage.py | 2 +-
diffoscope/comparators/gzip.py | 3 +--
diffoscope/comparators/libarchive.py | 1 -
diffoscope/comparators/macho.py | 1 -
diffoscope/comparators/squashfs.py | 1 -
diffoscope/comparators/symlink.py | 2 --
diffoscope/comparators/tar.py | 1 -
diffoscope/comparators/utils.py | 4 ----
diffoscope/comparators/xz.py | 3 +--
diffoscope/difference.py | 2 --
diffoscope/presenters/html.py | 1 -
20 files changed, 7 insertions(+), 37 deletions(-)
diff --git a/diffoscope/changes.py b/diffoscope/changes.py
index b671101..6a77f6e 100644
--- a/diffoscope/changes.py
+++ b/diffoscope/changes.py
@@ -41,7 +41,6 @@ __author__ = 'Jonny Lamb'
__copyright__ = 'Copyright © 2008 Jonny Lamb, Copyright © 2010 Jan Dittberner'
__license__ = 'MIT'
-import sys
import os.path
import hashlib
import subprocess
diff --git a/diffoscope/comparators/binary.py b/diffoscope/comparators/binary.py
index 941ecf7..d66205d 100644
--- a/diffoscope/comparators/binary.py
+++ b/diffoscope/comparators/binary.py
@@ -19,15 +19,12 @@
from abc import ABCMeta, abstractmethod
from binascii import hexlify
-from contextlib import contextmanager
-from functools import wraps
from io import StringIO
import os
import os.path
import re
from stat import S_ISCHR, S_ISBLK
import subprocess
-import tempfile
try:
import tlsh
except ImportError:
diff --git a/diffoscope/comparators/bzip2.py b/diffoscope/comparators/bzip2.py
index 797b649..9f8e42d 100644
--- a/diffoscope/comparators/bzip2.py
+++ b/diffoscope/comparators/bzip2.py
@@ -21,9 +21,8 @@ from collections import OrderedDict
import os.path
import re
import subprocess
-import diffoscope.comparators
from diffoscope.comparators.binary import File
-from diffoscope.comparators.utils import Archive, get_compressed_content_name, NO_COMMENT
+from diffoscope.comparators.utils import Archive, get_compressed_content_name
from diffoscope import logger, tool_required
diff --git a/diffoscope/comparators/cbfs.py b/diffoscope/comparators/cbfs.py
index 88ed200..2176779 100644
--- a/diffoscope/comparators/cbfs.py
+++ b/diffoscope/comparators/cbfs.py
@@ -22,7 +22,6 @@ import os
import os.path
import re
import subprocess
-import stat
import struct
from diffoscope import logger, tool_required
from diffoscope.comparators.binary import File
diff --git a/diffoscope/comparators/deb.py b/diffoscope/comparators/deb.py
index 536d218..978463d 100644
--- a/diffoscope/comparators/deb.py
+++ b/diffoscope/comparators/deb.py
@@ -18,7 +18,6 @@
# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
import re
-import os.path
try:
from debian import deb822
except ImportError:
@@ -29,7 +28,7 @@ import diffoscope.comparators
from diffoscope.comparators.binary import File
from diffoscope.comparators.libarchive import LibarchiveContainer, list_libarchive
from diffoscope.comparators.utils import \
- Archive, ArchiveMember
+ ArchiveMember
from diffoscope.comparators.tar import TarContainer
diff --git a/diffoscope/comparators/debian.py b/diffoscope/comparators/debian.py
index 9c12f3d..3dadc5f 100644
--- a/diffoscope/comparators/debian.py
+++ b/diffoscope/comparators/debian.py
@@ -18,19 +18,15 @@
# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from collections import OrderedDict
-from contextlib import contextmanager
from functools import partial
import hashlib
import os.path
import re
from debian.deb822 import Dsc
from diffoscope.changes import Changes
-import diffoscope.comparators
-from diffoscope.comparators.binary import File, NonExistingFile
-from diffoscope.comparators.utils import Container, NO_COMMENT
-from diffoscope.config import Config
+from diffoscope.comparators.binary import File
+from diffoscope.comparators.utils import Container
from diffoscope.difference import Difference
-from diffoscope import logger
DOT_CHANGES_FIELDS = [
diff --git a/diffoscope/comparators/device.py b/diffoscope/comparators/device.py
index 047376f..059a118 100644
--- a/diffoscope/comparators/device.py
+++ b/diffoscope/comparators/device.py
@@ -17,9 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
-from contextlib import contextmanager
import os
-import tempfile
from diffoscope.comparators.binary import File, FilesystemFile
from diffoscope.comparators.utils import format_device
from diffoscope.difference import Difference
diff --git a/diffoscope/comparators/dex.py b/diffoscope/comparators/dex.py
index 447c497..48420bb 100644
--- a/diffoscope/comparators/dex.py
+++ b/diffoscope/comparators/dex.py
@@ -24,7 +24,6 @@ import subprocess
from diffoscope import logger, tool_required
from diffoscope.comparators.binary import File
from diffoscope.comparators.utils import Archive, get_compressed_content_name
-from diffoscope.difference import Difference
class DexContainer(Archive):
diff --git a/diffoscope/comparators/directory.py b/diffoscope/comparators/directory.py
index 2b4d9db..c145be9 100644
--- a/diffoscope/comparators/directory.py
+++ b/diffoscope/comparators/directory.py
@@ -17,7 +17,6 @@
# You should have received a copy of the GNU General Public License
# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
-from contextlib import contextmanager
import os
import os.path
import re
diff --git a/diffoscope/comparators/fsimage.py b/diffoscope/comparators/fsimage.py
index 90f39f0..592312e 100644
--- a/diffoscope/comparators/fsimage.py
+++ b/diffoscope/comparators/fsimage.py
@@ -26,7 +26,7 @@ except ImportError:
guestfs = None
from diffoscope import logger
from diffoscope.comparators.binary import File
-from diffoscope.comparators.utils import Archive, get_compressed_content_name
+from diffoscope.comparators.utils import Archive
from diffoscope.difference import Difference
diff --git a/diffoscope/comparators/gzip.py b/diffoscope/comparators/gzip.py
index 3ddfa26..5ec244e 100644
--- a/diffoscope/comparators/gzip.py
+++ b/diffoscope/comparators/gzip.py
@@ -21,9 +21,8 @@ from collections import OrderedDict
import re
import subprocess
import os.path
-import diffoscope.comparators
from diffoscope import logger, tool_required
-from diffoscope.comparators.utils import Archive, get_compressed_content_name, NO_COMMENT
+from diffoscope.comparators.utils import Archive, get_compressed_content_name
from diffoscope.difference import Difference
diff --git a/diffoscope/comparators/libarchive.py b/diffoscope/comparators/libarchive.py
index 88c908a..7bbabdd 100644
--- a/diffoscope/comparators/libarchive.py
+++ b/diffoscope/comparators/libarchive.py
@@ -18,7 +18,6 @@
# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
-from contextlib import contextmanager
import ctypes
import os.path
import time
diff --git a/diffoscope/comparators/macho.py b/diffoscope/comparators/macho.py
index 4fbc3fc..a893fe8 100644
--- a/diffoscope/comparators/macho.py
+++ b/diffoscope/comparators/macho.py
@@ -18,7 +18,6 @@
# You should have received a copy of the GNU General Public License
# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
-import os.path
import re
import subprocess
from diffoscope import tool_required
diff --git a/diffoscope/comparators/squashfs.py b/diffoscope/comparators/squashfs.py
index 1231436..73c19b9 100644
--- a/diffoscope/comparators/squashfs.py
+++ b/diffoscope/comparators/squashfs.py
@@ -19,7 +19,6 @@
# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
from collections import OrderedDict
-from contextlib import contextmanager
import re
import subprocess
import stat
diff --git a/diffoscope/comparators/symlink.py b/diffoscope/comparators/symlink.py
index 76eaa71..bfe30a9 100644
--- a/diffoscope/comparators/symlink.py
+++ b/diffoscope/comparators/symlink.py
@@ -17,9 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with diffoscope. If not, see <http://www.gnu.org/licenses/>.
-from contextlib import contextmanager
import os
-import tempfile
from diffoscope.comparators.binary import File
from diffoscope.comparators.utils import format_symlink
from diffoscope.difference import Difference
diff --git a/diffoscope/comparators/tar.py b/diffoscope/comparators/tar.py
index ab5d8cd..8b4cc5a 100644
--- a/diffoscope/comparators/tar.py
+++ b/diffoscope/comparators/tar.py
@@ -21,7 +21,6 @@ import re
from diffoscope.difference import Difference
from diffoscope.comparators.binary import File
from diffoscope.comparators.libarchive import LibarchiveContainer, list_libarchive
-from diffoscope.comparators.utils import Command, tool_required
class TarContainer(LibarchiveContainer):
pass
diff --git a/diffoscope/comparators/utils.py b/diffoscope/comparators/utils.py
index 41a1eb7..b6da716 100644
--- a/diffoscope/comparators/utils.py
+++ b/diffoscope/comparators/utils.py
@@ -19,20 +19,16 @@
from abc import ABCMeta, abstractmethod
from collections import OrderedDict
-from contextlib import contextmanager
from io import BytesIO
from itertools import starmap
# The following would be shutil.which in Python 3.3
import os
-import shutil
from stat import S_ISCHR, S_ISBLK
import subprocess
-import tempfile
from threading import Thread
import diffoscope.comparators
from diffoscope.comparators.binary import File, NonExistingFile
from diffoscope.config import Config
-from diffoscope.difference import Difference
from diffoscope import logger, tool_required, get_temporary_directory
diff --git a/diffoscope/comparators/xz.py b/diffoscope/comparators/xz.py
index 0b1b6c4..81251dc 100644
--- a/diffoscope/comparators/xz.py
+++ b/diffoscope/comparators/xz.py
@@ -21,9 +21,8 @@ from collections import OrderedDict
import os.path
import re
import subprocess
-import diffoscope.comparators
from diffoscope.comparators.binary import File
-from diffoscope.comparators.utils import Archive, get_compressed_content_name, NO_COMMENT
+from diffoscope.comparators.utils import Archive, get_compressed_content_name
from diffoscope import logger, tool_required
diff --git a/diffoscope/difference.py b/diffoscope/difference.py
index 750c7bd..6a39e1f 100644
--- a/diffoscope/difference.py
+++ b/diffoscope/difference.py
@@ -25,8 +25,6 @@ import os.path
import re
import signal
import subprocess
-import sys
-import traceback
from threading import Thread
from multiprocessing.dummy import Queue
from diffoscope.config import Config
diff --git a/diffoscope/presenters/html.py b/diffoscope/presenters/html.py
index 9166cf6..a46dc6f 100644
--- a/diffoscope/presenters/html.py
+++ b/diffoscope/presenters/html.py
@@ -44,7 +44,6 @@ from xml.sax.saxutils import escape
from diffoscope import logger, VERSION
from diffoscope.config import Config
from diffoscope.presenters.icon import FAVICON_BASE64
-from functools import reduce
# minimum line size, we add a zero-sized breakable space every
# LINESIZE characters
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git
More information about the diffoscope
mailing list