From 6d5cc06cf6ed0d55e5a9eb19c8f999d8b23fc21d Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Mon, 2 Nov 2015 20:36:13 +0100
Subject: [PATCH] remove unused imports, add missing imports

---
 borg/archiver.py         | 2 +-
 borg/cache.py            | 4 ----
 borg/key.py              | 1 +
 borg/logger.py           | 1 -
 borg/repository.py       | 1 -
 borg/testsuite/logger.py | 1 -
 setup.py                 | 1 -
 7 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/borg/archiver.py b/borg/archiver.py
index c2aaecb81..e18ded6c6 100644
--- a/borg/archiver.py
+++ b/borg/archiver.py
@@ -17,7 +17,7 @@ import traceback
 from . import __version__
 from .helpers import Error, location_validator, format_time, format_file_size, \
     format_file_mode, ExcludePattern, IncludePattern, exclude_path, adjust_patterns, to_localtime, timestamp, \
-    get_cache_dir, get_keys_dir, format_timedelta, prune_within, prune_split, \
+    get_cache_dir, get_keys_dir, prune_within, prune_split, \
     Manifest, remove_surrogates, update_excludes, format_archive, check_extension_modules, Statistics, \
     is_cachedir, bigint_to_int, ChunkerParams, CompressionSpec, have_cython, is_slow_msgpack, yes, \
     EXIT_SUCCESS, EXIT_WARNING, EXIT_ERROR
diff --git a/borg/cache.py b/borg/cache.py
index 7eb854050..b31f68a44 100644
--- a/borg/cache.py
+++ b/borg/cache.py
@@ -1,14 +1,10 @@
 import configparser
 from .remote import cache_if_remote
 from collections import namedtuple
-import errno
 import os
 import stat
-import sys
 from binascii import hexlify
 import shutil
-import tarfile
-import tempfile
 
 from .key import PlaintextKey
 from .logger import create_logger
diff --git a/borg/key.py b/borg/key.py
index 43f6c5cad..bbe8bb584 100644
--- a/borg/key.py
+++ b/borg/key.py
@@ -2,6 +2,7 @@ from binascii import hexlify, a2b_base64, b2a_base64
 import configparser
 import getpass
 import os
+import sys
 import textwrap
 import hmac
 from hashlib import sha256
diff --git a/borg/logger.py b/borg/logger.py
index 69f2a3c22..6c5d2ff81 100644
--- a/borg/logger.py
+++ b/borg/logger.py
@@ -32,7 +32,6 @@ The way to use this is as follows:
 
 import inspect
 import logging
-import sys
 
 
 def setup_logging(stream=None):
diff --git a/borg/repository.py b/borg/repository.py
index 63dc2793b..230c7d866 100644
--- a/borg/repository.py
+++ b/borg/repository.py
@@ -8,7 +8,6 @@ logger = logging.getLogger(__name__)
 import os
 import shutil
 import struct
-import sys
 from zlib import crc32
 
 from .helpers import Error, ErrorWithTraceback, IntegrityError, read_msgpack, write_msgpack, unhexlify, have_cython
diff --git a/borg/testsuite/logger.py b/borg/testsuite/logger.py
index 1db72bf2e..ff8b0a03b 100644
--- a/borg/testsuite/logger.py
+++ b/borg/testsuite/logger.py
@@ -1,7 +1,6 @@
 import logging
 from io import StringIO
 
-from mock import Mock
 import pytest
 
 from ..logger import find_parent_module, create_logger, setup_logging
diff --git a/setup.py b/setup.py
index 6a5ed5863..284fddd09 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,6 @@ from glob import glob
 
 from distutils.command.build import build
 from distutils.core import Command
-from distutils.errors import DistutilsOptionError
 from distutils import log
 from setuptools.command.build_py import build_py