From c3117aa12ba7f556a90c02fce85433d39cced1e0 Mon Sep 17 00:00:00 2001 From: Mark Seaborn Date: Thu, 23 Oct 2008 19:03:40 +0100 Subject: [PATCH] Tidy: remove unused imports --- tests/basetest.py | 4 ++-- tests/testalias.py | 3 +-- tests/testautopolicy.py | 3 +-- tests/testdistro.py | 6 +++--- tests/testdownload.py | 5 ++--- tests/testgpg.py | 3 +-- tests/testifacecache.py | 8 +++----- tests/testlaunch.py | 4 ++-- tests/testmodel.py | 2 +- tests/testpolicy.py | 3 +-- tests/testqdom.py | 2 +- tests/testreader.py | 8 ++------ tests/testsolver.py | 2 +- tests/teststore.py | 4 +--- tests/testtrust.py | 3 +-- tests/testunpack.py | 2 +- tests/testwriter.py | 3 +-- zeroinstall/injector/download.py | 2 -- zeroinstall/injector/gpg.py | 1 - 19 files changed, 25 insertions(+), 43 deletions(-) diff --git a/tests/basetest.py b/tests/basetest.py index 989d0e0..0ba8a31 100755 --- a/tests/basetest.py +++ b/tests/basetest.py @@ -11,8 +11,8 @@ warnings.filterwarnings("ignore", category = DeprecationWarning) os.environ['HOME'] = '/home/idontexist' sys.path.insert(0, '..') -from zeroinstall.injector import trust, autopolicy, namespaces, qdom -from zeroinstall.injector import model, iface_cache, cli, download, writer, distro +from zeroinstall.injector import namespaces, qdom +from zeroinstall.injector import iface_cache, download, distro from zeroinstall.zerostore import Store; Store._add_with_helper = lambda *unused: False from zeroinstall import support from zeroinstall.support import basedir diff --git a/tests/testalias.py b/tests/testalias.py index af714ad..3741734 100755 --- a/tests/testalias.py +++ b/tests/testalias.py @@ -1,9 +1,8 @@ #!/usr/bin/env python2.4 from basetest import BaseTest -import sys, tempfile, os, shutil, logging +import sys, tempfile from StringIO import StringIO import unittest -from logging import getLogger, DEBUG, INFO sys.path.insert(0, '..') diff --git a/tests/testautopolicy.py b/tests/testautopolicy.py index 32a3a44..31e5454 100755 --- a/tests/testautopolicy.py +++ b/tests/testautopolicy.py @@ -1,9 +1,8 @@ #!/usr/bin/env python2.4 from basetest import BaseTest -import sys, tempfile, os, shutil, logging +import sys, tempfile, os, logging from StringIO import StringIO import unittest -from logging import getLogger, DEBUG, INFO sys.path.insert(0, '..') diff --git a/tests/testdistro.py b/tests/testdistro.py index a5deb2c..884bf66 100755 --- a/tests/testdistro.py +++ b/tests/testdistro.py @@ -1,10 +1,10 @@ #!/usr/bin/env python2.4 from basetest import BaseTest, empty_feed -import sys, tempfile, os, shutil, StringIO -import unittest, logging +import sys +import unittest sys.path.insert(0, '..') -from zeroinstall.injector import distro, model, qdom +from zeroinstall.injector import distro, model class TestDistro(BaseTest): def setUp(self): diff --git a/tests/testdownload.py b/tests/testdownload.py index da995b3..c5445c1 100755 --- a/tests/testdownload.py +++ b/tests/testdownload.py @@ -1,9 +1,9 @@ #!/usr/bin/env python2.4 from basetest import BaseTest -import sys, tempfile, os, shutil +import sys, tempfile, os from StringIO import StringIO import unittest, signal -from logging import getLogger, DEBUG, INFO, WARN, ERROR +from logging import getLogger, WARN, ERROR sys.path.insert(0, '..') @@ -116,7 +116,6 @@ class TestDownload(BaseTest): old_out = sys.stdout try: from zeroinstall.injector import cli - import logging rootLogger = getLogger() rootLogger.disabled = True diff --git a/tests/testgpg.py b/tests/testgpg.py index eff82cc..d5a9aed 100755 --- a/tests/testgpg.py +++ b/tests/testgpg.py @@ -1,11 +1,10 @@ #!/usr/bin/env python2.4 from basetest import BaseTest -import sys, tempfile, os, shutil +import sys, tempfile import unittest sys.path.insert(0, '..') from zeroinstall.injector import gpg, model, trust -from zeroinstall.support import basedir err_sig = """-----BEGIN PGP MESSAGE----- Version: GnuPG v1.4.0 (GNU/Linux) diff --git a/tests/testifacecache.py b/tests/testifacecache.py index c50c8ae..3982aad 100755 --- a/tests/testifacecache.py +++ b/tests/testifacecache.py @@ -1,14 +1,12 @@ #!/usr/bin/env python2.4 from basetest import BaseTest -import sys, tempfile, os, shutil, time +import sys, tempfile, os, time import unittest import data -from logging import getLogger, DEBUG, INFO -#getLogger().setLevel(DEBUG) sys.path.insert(0, '..') -from zeroinstall.injector import download, model, gpg, trust -from zeroinstall.injector.namespaces import * +from zeroinstall.injector import model, gpg, trust +from zeroinstall.injector.namespaces import config_site from zeroinstall.injector.iface_cache import iface_cache, PendingFeed from zeroinstall.support import basedir diff --git a/tests/testlaunch.py b/tests/testlaunch.py index 806804d..cc69d1d 100755 --- a/tests/testlaunch.py +++ b/tests/testlaunch.py @@ -1,6 +1,6 @@ #!/usr/bin/env python2.4 from basetest import BaseTest -import sys, tempfile, os, shutil, imp +import sys, tempfile, os, imp from StringIO import StringIO import unittest import logging @@ -8,7 +8,7 @@ import logging foo_iface_uri = 'http://foo' sys.path.insert(0, '..') -from zeroinstall.injector import trust, autopolicy, namespaces, model, iface_cache, cli +from zeroinstall.injector import autopolicy, model, cli from zeroinstall.zerostore import Store; Store._add_with_helper = lambda *unused: False from zeroinstall.support import basedir diff --git a/tests/testmodel.py b/tests/testmodel.py index 45f0a70..cab24f4 100755 --- a/tests/testmodel.py +++ b/tests/testmodel.py @@ -1,7 +1,7 @@ #!/usr/bin/env python2.4 # -*- coding: utf-8 -*- from basetest import BaseTest, empty_feed -import sys, tempfile, os, shutil +import sys from xml.dom import minidom import unittest from StringIO import StringIO diff --git a/tests/testpolicy.py b/tests/testpolicy.py index 5e9c47e..887febd 100755 --- a/tests/testpolicy.py +++ b/tests/testpolicy.py @@ -1,12 +1,11 @@ #!/usr/bin/env python2.4 from basetest import BaseTest -import sys, tempfile, os, shutil +import sys import unittest sys.path.insert(0, '..') from zeroinstall.injector import autopolicy, reader, model from zeroinstall.injector.iface_cache import iface_cache -from zeroinstall.support import basedir import logging logger = logging.getLogger() diff --git a/tests/testqdom.py b/tests/testqdom.py index a130cfc..3760bfb 100755 --- a/tests/testqdom.py +++ b/tests/testqdom.py @@ -1,6 +1,6 @@ #!/usr/bin/env python2.4 from basetest import BaseTest -import sys, tempfile, os, shutil +import sys from StringIO import StringIO import unittest diff --git a/tests/testreader.py b/tests/testreader.py index 896c7ce..9f3952f 100755 --- a/tests/testreader.py +++ b/tests/testreader.py @@ -1,15 +1,11 @@ #!/usr/bin/env python2.4 from basetest import BaseTest -import sys, tempfile, os, shutil, logging -from StringIO import StringIO +import sys, tempfile, logging import unittest -from logging import getLogger, DEBUG, INFO sys.path.insert(0, '..') -from zeroinstall import NeedDownload -from zeroinstall.injector import model, autopolicy, gpg, iface_cache, namespaces, reader -from zeroinstall.support import basedir +from zeroinstall.injector import model, gpg, reader import data foo_iface_uri = 'http://foo' diff --git a/tests/testsolver.py b/tests/testsolver.py index c251884..477e312 100755 --- a/tests/testsolver.py +++ b/tests/testsolver.py @@ -1,6 +1,6 @@ #!/usr/bin/env python2.4 from basetest import BaseTest -import sys, tempfile, os, shutil +import sys import unittest sys.path.insert(0, '..') diff --git a/tests/teststore.py b/tests/teststore.py index 29f4349..4845266 100755 --- a/tests/teststore.py +++ b/tests/teststore.py @@ -1,10 +1,8 @@ #!/usr/bin/env python2.4 from basetest import BaseTest -import sys, tempfile, os, shutil +import sys, tempfile, os from StringIO import StringIO import unittest -from logging import getLogger, DEBUG, INFO -#getLogger().setLevel(DEBUG) sys.path.insert(0, '..') diff --git a/tests/testtrust.py b/tests/testtrust.py index d62de75..14319f2 100755 --- a/tests/testtrust.py +++ b/tests/testtrust.py @@ -1,6 +1,6 @@ #!/usr/bin/env python2.4 from basetest import BaseTest -import sys, tempfile, os, shutil +import sys import unittest thomas_fingerprint = "92429807C9853C0744A68B9AAE07828059A53CC1" @@ -8,7 +8,6 @@ thomas_fingerprint = "92429807C9853C0744A68B9AAE07828059A53CC1" sys.path.insert(0, '..') from zeroinstall.injector import trust from zeroinstall import SafeException -from zeroinstall.support import basedir class TestTrust(BaseTest): def testInit(self): diff --git a/tests/testunpack.py b/tests/testunpack.py index 3e894fa..91cb24c 100755 --- a/tests/testunpack.py +++ b/tests/testunpack.py @@ -1,6 +1,6 @@ #!/usr/bin/env python2.4 from basetest import BaseTest -import sys, tempfile, os, shutil, sha +import sys, tempfile, os import unittest sys.path.insert(0, '..') diff --git a/tests/testwriter.py b/tests/testwriter.py index 9ac33af..9c07e80 100755 --- a/tests/testwriter.py +++ b/tests/testwriter.py @@ -1,11 +1,10 @@ #!/usr/bin/env python2.4 from basetest import BaseTest -import sys, tempfile, os, shutil, StringIO +import sys, StringIO import unittest sys.path.insert(0, '..') from zeroinstall.injector import writer, model, reader, qdom -from zeroinstall.support import basedir test_feed = qdom.parse(StringIO.StringIO(""" Test diff --git a/zeroinstall/injector/download.py b/zeroinstall/injector/download.py index 46edeef..5c362bb 100644 --- a/zeroinstall/injector/download.py +++ b/zeroinstall/injector/download.py @@ -12,7 +12,6 @@ This is the low-level interface for downloading interfaces, implementations, ico import tempfile, os, sys, subprocess from zeroinstall import SafeException from zeroinstall.support import tasks -import traceback from logging import info download_starting = "starting" # Waiting for UI to start it @@ -189,7 +188,6 @@ if __name__ == '__main__': def _download_as_child(url): from httplib import HTTPException from urllib2 import urlopen, HTTPError, URLError - import shutil try: #print "Child downloading", url if url.startswith('/'): diff --git a/zeroinstall/injector/gpg.py b/zeroinstall/injector/gpg.py index 7bead09..9aeb1ad 100644 --- a/zeroinstall/injector/gpg.py +++ b/zeroinstall/injector/gpg.py @@ -13,7 +13,6 @@ import subprocess import base64, re import os import tempfile -import traceback from logging import info from zeroinstall import support -- 2.11.4.GIT