add missing imports, remove unused imports

21 files changed, 2 insertions, 32 deletions

diff --git a/find-all-obnam-errors b/find-all-obnam-errors
index c0403dd4..711f1f8c 100755
--- a/find-all-obnam-errors
+++ b/find-all-obnam-errors
@@ -17,7 +17,6 @@
 # =*= License: GPL-3+ =*=
 
 
-import collections
 import imp
 import inspect
 import os
diff --git a/metadata-speed b/metadata-speed
index c821bf46..b183a4b9 100755
--- a/metadata-speed
+++ b/metadata-speed
@@ -15,9 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-import os
-import random
-import shutil
 import sys
 import time
 
diff --git a/obnam-benchmark b/obnam-benchmark
index 0b54c612..05e62b3b 100755
--- a/obnam-benchmark
+++ b/obnam-benchmark
@@ -23,7 +23,6 @@ import platform
 import re
 import shutil
 import stat
-import sys
 import tempfile
 import time
 
diff --git a/obnamlib/app.py b/obnamlib/app.py
index a3159acc..45b444d9 100644
--- a/obnamlib/app.py
+++ b/obnamlib/app.py
@@ -17,9 +17,7 @@
 import cliapp
 import larch
 import logging
-import os
 import socket
-import StringIO
 import sys
 import time
 import tracing
diff --git a/obnamlib/encryption_tests.py b/obnamlib/encryption_tests.py
index 0cf58394..7781be43 100644
--- a/obnamlib/encryption_tests.py
+++ b/obnamlib/encryption_tests.py
@@ -16,7 +16,6 @@
 
 import os
 import shutil
-import subprocess
 import tempfile
 import unittest
 
diff --git a/obnamlib/fmt_6/chunklist.py b/obnamlib/fmt_6/chunklist.py
index e34aa652..f94d83cf 100644
--- a/obnamlib/fmt_6/chunklist.py
+++ b/obnamlib/fmt_6/chunklist.py
@@ -14,9 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-import hashlib
 import struct
-import random
 import tracing
 
 import obnamlib
diff --git a/obnamlib/fmt_6/metadata_codec.py b/obnamlib/fmt_6/metadata_codec.py
index 2e281c6b..55405d55 100644
--- a/obnamlib/fmt_6/metadata_codec.py
+++ b/obnamlib/fmt_6/metadata_codec.py
@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+import logging
 import struct
 
 import obnamlib
diff --git a/obnamlib/fmt_6/repo_fmt_6.py b/obnamlib/fmt_6/repo_fmt_6.py
index 7a938c50..9c08716d 100644
--- a/obnamlib/fmt_6/repo_fmt_6.py
+++ b/obnamlib/fmt_6/repo_fmt_6.py
@@ -22,7 +22,6 @@ import os
 import random
 import re
 import stat
-import struct
 import time
 import tracing
 
diff --git a/obnamlib/fmt_6/repo_tree.py b/obnamlib/fmt_6/repo_tree.py
index 64302f5a..bd755074 100644
--- a/obnamlib/fmt_6/repo_tree.py
+++ b/obnamlib/fmt_6/repo_tree.py
@@ -17,8 +17,6 @@
 import larch
 import tracing
 
-import obnamlib
-
 
 class RepositoryTree(object):
 
diff --git a/obnamlib/metadata_tests.py b/obnamlib/metadata_tests.py
index 98fbebe7..34afe602 100644
--- a/obnamlib/metadata_tests.py
+++ b/obnamlib/metadata_tests.py
@@ -18,7 +18,6 @@ import os
 import stat
 import tempfile
 import unittest
-import platform
 
 import obnamlib
 
diff --git a/obnamlib/pluginbase.py b/obnamlib/pluginbase.py
index d1a75fb4..0e8916f5 100644
--- a/obnamlib/pluginbase.py
+++ b/obnamlib/pluginbase.py
@@ -16,8 +16,6 @@
 
 import cliapp
 
-import obnamlib
-
 
 class ObnamPlugin(cliapp.Plugin):
 
diff --git a/obnamlib/plugins/backup_plugin.py b/obnamlib/plugins/backup_plugin.py
index 6c63955a..0cdd0237 100644
--- a/obnamlib/plugins/backup_plugin.py
+++ b/obnamlib/plugins/backup_plugin.py
@@ -15,17 +15,14 @@
 
 
 import errno
-import gc
 import hashlib
 import logging
 import os
 import re
 import stat
-import sys
 import time
 import traceback
 import tracing
-import ttystatus
 
 import obnamlib
 import larch
diff --git a/obnamlib/plugins/compression_plugin.py b/obnamlib/plugins/compression_plugin.py
index 54f08566..9f0d8b68 100644
--- a/obnamlib/plugins/compression_plugin.py
+++ b/obnamlib/plugins/compression_plugin.py
@@ -15,7 +15,6 @@
 
 
 import logging
-import os
 import zlib
 
 import obnamlib
diff --git a/obnamlib/plugins/force_lock_plugin.py b/obnamlib/plugins/force_lock_plugin.py
index 931a96fc..5eaf7be3 100644
--- a/obnamlib/plugins/force_lock_plugin.py
+++ b/obnamlib/plugins/force_lock_plugin.py
@@ -15,7 +15,6 @@
 
 
 import logging
-import os
 
 import obnamlib
 
diff --git a/obnamlib/plugins/fsck_plugin.py b/obnamlib/plugins/fsck_plugin.py
index 86c7ea9b..5b9c4a64 100644
--- a/obnamlib/plugins/fsck_plugin.py
+++ b/obnamlib/plugins/fsck_plugin.py
@@ -15,12 +15,9 @@
 
 
 import hashlib
-import larch.fsck
 import logging
-import os
 import stat
 import sys
-import ttystatus
 
 import obnamlib
 from obnamlib import WorkItem
diff --git a/obnamlib/plugins/fuse_plugin.py b/obnamlib/plugins/fuse_plugin.py
index 30531295..691fb90d 100644
--- a/obnamlib/plugins/fuse_plugin.py
+++ b/obnamlib/plugins/fuse_plugin.py
@@ -16,7 +16,6 @@
 
 import os
 import stat
-import sys
 import logging
 import errno
 import struct
diff --git a/obnamlib/plugins/restore_plugin.py b/obnamlib/plugins/restore_plugin.py
index 7d54f412..88ea15b7 100644
--- a/obnamlib/plugins/restore_plugin.py
+++ b/obnamlib/plugins/restore_plugin.py
@@ -19,7 +19,6 @@ import logging
 import os
 import stat
 import time
-import ttystatus
 
 import obnamlib
 
diff --git a/obnamlib/plugins/sftp_plugin.py b/obnamlib/plugins/sftp_plugin.py
index a496c1d6..f37c6904 100644
--- a/obnamlib/plugins/sftp_plugin.py
+++ b/obnamlib/plugins/sftp_plugin.py
@@ -25,8 +25,8 @@ import socket
 import stat
 import subprocess
 import time
-import traceback
 import urlparse
+import getpass
 
 
 # As of 2010-07-10, Debian's paramiko package triggers
diff --git a/obnamlib/plugins/show_plugin.py b/obnamlib/plugins/show_plugin.py
index 693a6d33..7efe124e 100644
--- a/obnamlib/plugins/show_plugin.py
+++ b/obnamlib/plugins/show_plugin.py
@@ -14,7 +14,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-import os
 import re
 import stat
 import sys
diff --git a/obnamlib/plugins/vfs_local_plugin.py b/obnamlib/plugins/vfs_local_plugin.py
index 2851c5d6..d72ac91a 100644
--- a/obnamlib/plugins/vfs_local_plugin.py
+++ b/obnamlib/plugins/vfs_local_plugin.py
@@ -15,9 +15,6 @@
 
 
 import logging
-import os
-import re
-import stat
 
 import obnamlib
 
diff --git a/obnamlib/vfs.py b/obnamlib/vfs.py
index 3f99c045..cdd0ae6b 100644
--- a/obnamlib/vfs.py
+++ b/obnamlib/vfs.py
@@ -15,7 +15,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
-import errno
 import logging
 import os
 import stat