From a11ee6857ca09b9c2909e6d916ea4284465e98b6 Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Wed, 30 Jul 2008 19:37:13 +0100
Subject: [PATCH] Removed a load of unused imports.

Thanks, pyflakes! Also found a bug.

Note that this is a slight API change, since it was previously possible to get
these symbols from the wrong module without error.
---
 zeroinstall/0launch-gui/bugs.py          |  4 ----
 zeroinstall/0launch-gui/compile.py       |  2 +-
 zeroinstall/0launch-gui/iface_browser.py |  2 +-
 zeroinstall/0launch-gui/main.py          |  2 +-
 zeroinstall/0launch-gui/mainwindow.py    |  3 +--
 zeroinstall/0launch-gui/preferences.py   |  4 +---
 zeroinstall/0launch-gui/properties.py    |  9 ++++-----
 zeroinstall/0launch-gui/trust_box.py     |  2 --
 zeroinstall/gtkui/cache.py               |  2 +-
 zeroinstall/injector/autopolicy.py       |  5 +----
 zeroinstall/injector/cli.py              | 21 +++++++++++----------
 zeroinstall/injector/fetch.py            |  4 ++--
 zeroinstall/injector/handler.py          |  6 ++----
 zeroinstall/injector/iface_cache.py      |  4 ++--
 zeroinstall/injector/model.py            | 14 +++++++-------
 zeroinstall/injector/policy.py           | 14 +++++++-------
 zeroinstall/injector/qdom.py             |  1 -
 zeroinstall/injector/reader.py           | 10 +++-------
 zeroinstall/injector/run.py              |  2 +-
 zeroinstall/injector/selections.py       |  4 +---
 zeroinstall/injector/solver.py           |  1 -
 zeroinstall/injector/writer.py           |  3 +--
 22 files changed, 48 insertions(+), 71 deletions(-)

diff --git a/zeroinstall/0launch-gui/bugs.py b/zeroinstall/0launch-gui/bugs.py
index 76acf38..9ca4b20 100644
--- a/zeroinstall/0launch-gui/bugs.py
+++ b/zeroinstall/0launch-gui/bugs.py
@@ -4,7 +4,6 @@
 import sys, os
 import gtk, pango
 import dialog
-import logging
 
 import zeroinstall
 from zeroinstall import support
@@ -160,9 +159,6 @@ class BugReporter(dialog.Dialog):
 		self.show_all()
 
 	def collect_output(self, buffer):
-		import logging
-		from zeroinstall.injector import run
-
 		iter = buffer.get_end_iter()
 		buffer.place_cursor(iter)
 
diff --git a/zeroinstall/0launch-gui/compile.py b/zeroinstall/0launch-gui/compile.py
index 52aac81..a12a912 100644
--- a/zeroinstall/0launch-gui/compile.py
+++ b/zeroinstall/0launch-gui/compile.py
@@ -2,7 +2,7 @@
 # See the README file for details, or visit http://0install.net.
 
 import os, popen2
-import gtk, gobject
+import gobject
 import dialog
 from logging import info
 
diff --git a/zeroinstall/0launch-gui/iface_browser.py b/zeroinstall/0launch-gui/iface_browser.py
index f697410..9269a2c 100644
--- a/zeroinstall/0launch-gui/iface_browser.py
+++ b/zeroinstall/0launch-gui/iface_browser.py
@@ -3,7 +3,7 @@
 
 import gtk, gobject, pango
 
-from zeroinstall.support import basedir, tasks, pretty_size
+from zeroinstall.support import tasks, pretty_size
 from zeroinstall.injector.iface_cache import iface_cache
 from zeroinstall.injector import model
 import properties
diff --git a/zeroinstall/0launch-gui/main.py b/zeroinstall/0launch-gui/main.py
index e030b2b..1d29827 100644
--- a/zeroinstall/0launch-gui/main.py
+++ b/zeroinstall/0launch-gui/main.py
@@ -5,7 +5,7 @@ import os, sys
 
 from optparse import OptionParser
 
-from zeroinstall.injector import model, autopolicy, namespaces, arch
+from zeroinstall.injector import model, arch
 from zeroinstall.injector.policy import Policy
 from zeroinstall.injector.iface_cache import iface_cache
 from zeroinstall.support import tasks
diff --git a/zeroinstall/0launch-gui/mainwindow.py b/zeroinstall/0launch-gui/mainwindow.py
index 7a3d672..83597f9 100644
--- a/zeroinstall/0launch-gui/mainwindow.py
+++ b/zeroinstall/0launch-gui/mainwindow.py
@@ -2,8 +2,7 @@
 # See the README file for details, or visit http://0install.net.
 
 import gtk
-from logging import warn
-import os, sys
+import sys
 from zeroinstall import SafeException
 from zeroinstall.support import tasks, pretty_size
 from zeroinstall.injector import download
diff --git a/zeroinstall/0launch-gui/preferences.py b/zeroinstall/0launch-gui/preferences.py
index 2b41bb3..ef0f11a 100644
--- a/zeroinstall/0launch-gui/preferences.py
+++ b/zeroinstall/0launch-gui/preferences.py
@@ -2,9 +2,7 @@
 # See the README file for details, or visit http://0install.net.
 
 import gtk
-from logging import warn
-import os, sys
-from dialog import Dialog, MixedButton, frame, Template
+from dialog import Template
 from zeroinstall.gtkui import help_box
 from zeroinstall.injector.model import network_levels
 from zeroinstall.injector import trust, gpg
diff --git a/zeroinstall/0launch-gui/properties.py b/zeroinstall/0launch-gui/properties.py
index 80278b3..3473c30 100644
--- a/zeroinstall/0launch-gui/properties.py
+++ b/zeroinstall/0launch-gui/properties.py
@@ -3,12 +3,12 @@
 
 import zeroinstall
 from zeroinstall.support import tasks
-from zeroinstall.injector.model import *
+from zeroinstall.injector.model import Interface, Feed, stable, testing, developer, stability_levels
 from zeroinstall.injector.iface_cache import iface_cache
 from zeroinstall.injector import writer, namespaces, gpg
 from zeroinstall.gtkui import help_box
 
-import gtk, sys, os
+import gtk
 from logging import warn
 
 from dialog import DialogResponse, Template
@@ -372,7 +372,7 @@ def add_remote_feed(policy, parent, interface):
 				try:
 					url = entry.get_text()
 					if not url:
-						raise SafeException(_('Enter a URL'))
+						raise zeroinstall.SafeException(_('Enter a URL'))
 					fetch = policy.fetcher.download_and_import_feed(url, iface_cache)
 					if fetch:
 						d.set_sensitive(False)
@@ -398,7 +398,7 @@ def add_remote_feed(policy, parent, interface):
 							writer.save_interface(interface)
 							d.destroy()
 							policy.recalculate()
-				except SafeException, ex:
+				except zeroinstall.SafeException, ex:
 					error(str(ex))
 			else:
 				d.destroy()
@@ -412,7 +412,6 @@ def add_local_feed(policy, interface):
 	sel = gtk.FileSelection(_('Select XML feed file'))
 	sel.set_has_separator(False)
 	def ok(b):
-		from xml.dom import minidom
 		from zeroinstall.injector import reader
 		feed = sel.get_filename()
 		try:
diff --git a/zeroinstall/0launch-gui/trust_box.py b/zeroinstall/0launch-gui/trust_box.py
index 1f38e66..293668f 100644
--- a/zeroinstall/0launch-gui/trust_box.py
+++ b/zeroinstall/0launch-gui/trust_box.py
@@ -5,11 +5,9 @@
 import gtk
 from zeroinstall.injector.model import SafeException
 from zeroinstall.injector import gpg, trust
-from zeroinstall.injector.iface_cache import iface_cache
 from zeroinstall.support import tasks
 from zeroinstall.gtkui import help_box
 
-import gui
 import dialog
 
 def pretty_fp(fp):
diff --git a/zeroinstall/gtkui/cache.py b/zeroinstall/gtkui/cache.py
index 49ba5cb..97dd596 100644
--- a/zeroinstall/gtkui/cache.py
+++ b/zeroinstall/gtkui/cache.py
@@ -2,7 +2,7 @@
 # Copyright (C) 2008, Thomas Leonard
 # See the README file for details, or visit http://0install.net.
 
-import os, shutil
+import os
 import gtk
 
 from zeroinstall.injector import namespaces, model
diff --git a/zeroinstall/injector/autopolicy.py b/zeroinstall/injector/autopolicy.py
index 4d83126..b29397a 100644
--- a/zeroinstall/injector/autopolicy.py
+++ b/zeroinstall/injector/autopolicy.py
@@ -11,13 +11,10 @@ is also the policy used to run the injector's GUI.
 # Copyright (C) 2006, Thomas Leonard
 # See the README file for details, or visit http://0install.net.
 
-import os
-from logging import debug, info, warn
+from logging import info
 
-from zeroinstall.support import tasks
 from zeroinstall.injector import model, policy, run
 from zeroinstall.injector.handler import Handler
-from zeroinstall import NeedDownload
 
 class AutoPolicy(policy.Policy):
 	__slots__ = ['download_only']
diff --git a/zeroinstall/injector/cli.py b/zeroinstall/injector/cli.py
index 5cc772e..57fecd1 100644
--- a/zeroinstall/injector/cli.py
+++ b/zeroinstall/injector/cli.py
@@ -9,7 +9,8 @@ import os, sys
 from optparse import OptionParser
 import logging
 
-from zeroinstall.injector import model, download, autopolicy, namespaces
+from zeroinstall import SafeException, NeedDownload
+from zeroinstall.injector import model, autopolicy, namespaces
 from zeroinstall.injector.iface_cache import iface_cache
 
 #def program_log(msg): os.access('MARK: 0launch: ' + msg, os.F_OK)
@@ -32,19 +33,19 @@ def _list_interfaces(args):
 
 def _import_feed(args):
 	from zeroinstall.support import tasks
-	from zeroinstall.injector import gpg, handler, trust
+	from zeroinstall.injector import gpg, handler
 	from zeroinstall.injector.iface_cache import PendingFeed
 	from xml.dom import minidom
 	for x in args:
 		if not os.path.isfile(x):
-			raise model.SafeException("File '%s' does not exist" % x)
+			raise SafeException("File '%s' does not exist" % x)
 		logging.info("Importing from file '%s'", x)
 		signed_data = file(x)
 		data, sigs = gpg.check_stream(signed_data)
 		doc = minidom.parseString(data.read())
 		uri = doc.documentElement.getAttribute('uri')
 		if not uri:
-			raise model.SafeException("Missing 'uri' attribute on root element in '%s'" % x)
+			raise SafeException("Missing 'uri' attribute on root element in '%s'" % x)
 		iface = iface_cache.get_interface(uri)
 		logging.info("Importing information about interface %s", iface)
 		signed_data.seek(0)
@@ -69,7 +70,7 @@ def _import_feed(args):
 
 		errors = handler.wait_for_blocker(task.finished)
 		if errors:
-			raise model.SafeException("Errors during download: " + '\n'.join(errors))
+			raise SafeException("Errors during download: " + '\n'.join(errors))
 
 def _manage_feeds(options, args):
 	from zeroinstall.injector import writer
@@ -104,7 +105,7 @@ def _manage_feeds(options, args):
 				i = raw_input('Enter a number, or CTRL-C to cancel [1]: ').strip()
 			except KeyboardInterrupt:
 				print
-				raise model.SafeException("Aborted at user request.")
+				raise SafeException("Aborted at user request.")
 			if i == '':
 				i = 1
 			else:
@@ -160,9 +161,9 @@ def _normal_mode(options, args):
 
 	if options.get_selections:
 		if len(args) > 1:
-			raise model.SafeException("Can't use arguments with --get-selections")
+			raise SafeException("Can't use arguments with --get-selections")
 		if options.main:
-			raise model.SafeException("Can't use --main with --get-selections")
+			raise SafeException("Can't use --main with --get-selections")
 
 	# Note that need_download() triggers a solve
 	if options.refresh or options.gui:
@@ -247,7 +248,7 @@ def _normal_mode(options, args):
 		else:
 			#program_log('download_and_execute ' + iface_uri)
 			policy.download_and_execute(prog_args, refresh = bool(options.refresh), main = options.main)
-	except autopolicy.NeedDownload, ex:
+	except NeedDownload, ex:
 		# This only happens for dry runs
 		print ex
 
@@ -359,7 +360,7 @@ def main(command_args):
 	except UsageError:
 		parser.print_help()
 		sys.exit(1)
-	except model.SafeException, ex:
+	except SafeException, ex:
 		if options.verbose: raise
 		print >>sys.stderr, ex
 		sys.exit(1)
diff --git a/zeroinstall/injector/fetch.py b/zeroinstall/injector/fetch.py
index e3e0e0d..c067901 100644
--- a/zeroinstall/injector/fetch.py
+++ b/zeroinstall/injector/fetch.py
@@ -5,12 +5,12 @@ Downloads feeds, keys, packages and icons.
 # Copyright (C) 2008, Thomas Leonard
 # See the README file for details, or visit http://0install.net.
 
-import os, sys
+import os
 from logging import info, debug, warn
 
 from zeroinstall.support import tasks, basedir
 from zeroinstall.injector.namespaces import XMLNS_IFACE, config_site
-from zeroinstall.injector.model import DownloadSource, Recipe, SafeException, network_offline, escape
+from zeroinstall.injector.model import DownloadSource, Recipe, SafeException, escape
 from zeroinstall.injector.iface_cache import PendingFeed, ReplayAttack
 from zeroinstall.injector.handler import NoTrustedKeys
 
diff --git a/zeroinstall/injector/handler.py b/zeroinstall/injector/handler.py
index 18b9cee..91bc20f 100644
--- a/zeroinstall/injector/handler.py
+++ b/zeroinstall/injector/handler.py
@@ -10,13 +10,11 @@ To do this, you supply a L{Handler} to the L{policy}.
 # Copyright (C) 2006, Thomas Leonard
 # See the README file for details, or visit http://0install.net.
 
-import os, sys
-from logging import debug, info, warn
+from logging import debug, warn
 
 from zeroinstall import NeedDownload, SafeException
 from zeroinstall.support import tasks
-from zeroinstall.injector import model, download
-from zeroinstall.injector.iface_cache import iface_cache
+from zeroinstall.injector import download
 
 class NoTrustedKeys(SafeException):
 	"""Thrown by L{Handler.confirm_trust_keys} on failure."""
diff --git a/zeroinstall/injector/iface_cache.py b/zeroinstall/injector/iface_cache.py
index abf8c9b..220d109 100644
--- a/zeroinstall/injector/iface_cache.py
+++ b/zeroinstall/injector/iface_cache.py
@@ -33,8 +33,8 @@ from cStringIO import StringIO
 
 from zeroinstall.support import basedir
 from zeroinstall.injector import reader, model
-from zeroinstall.injector.namespaces import *
-from zeroinstall.injector.model import *
+from zeroinstall.injector.namespaces import config_site, config_prog
+from zeroinstall.injector.model import Interface, escape, unescape
 from zeroinstall import zerostore, SafeException
 
 def _pretty_time(t):
diff --git a/zeroinstall/injector/model.py b/zeroinstall/injector/model.py
index 3c7e0b9..1e61e8d 100644
--- a/zeroinstall/injector/model.py
+++ b/zeroinstall/injector/model.py
@@ -14,7 +14,7 @@ well-known variables.
 # See the README file for details, or visit http://0install.net.
 
 import os, re
-from logging import warn, info, debug
+from logging import info, debug
 from zeroinstall import SafeException, version
 from zeroinstall.injector.namespaces import XMLNS_IFACE
 
@@ -48,14 +48,14 @@ def _split_arch(arch):
 	elif '-' not in arch:
 		raise SafeException("Malformed arch '%s'" % arch)
 	else:
-		os, machine = arch.split('-', 1)
-		if os == '*': os = None
+		osys, machine = arch.split('-', 1)
+		if osys == '*': osys = None
 		if machine == '*': machine = None
-		return os, machine
+		return osys, machine
 
-def _join_arch(os, machine):
-	if os == machine == None: return None
-	return "%s-%s" % (os or '*', machine or '*')
+def _join_arch(osys, machine):
+	if osys == machine == None: return None
+	return "%s-%s" % (osys or '*', machine or '*')
 	
 class Stability(object):
 	"""A stability rating. Each implementation has an upstream stability rating and,
diff --git a/zeroinstall/injector/policy.py b/zeroinstall/injector/policy.py
index af6d326..2457a4a 100644
--- a/zeroinstall/injector/policy.py
+++ b/zeroinstall/injector/policy.py
@@ -8,16 +8,16 @@ settings.
 # See the README file for details, or visit http://0install.net.
 
 import time
-import sys, os
+import os
 from logging import info, debug, warn
-import arch
-
-from model import *
-from namespaces import *
 import ConfigParser
+
+from zeroinstall import SafeException
+from zeroinstall.injector import arch
+from zeroinstall.injector.model import Interface, Implementation, network_levels, network_offline, DistributionImplementation, network_full
+from zeroinstall.injector.namespaces import config_site, config_prog, injector_gui_uri
 from zeroinstall.support import tasks, basedir
-from zeroinstall.injector.iface_cache import iface_cache, PendingFeed
-from zeroinstall.injector.trust import trust_db
+from zeroinstall.injector.iface_cache import iface_cache
 
 # If we started a check within this period, don't start another one:
 FAILED_CHECK_DELAY = 60 * 60	# 1 Hour
diff --git a/zeroinstall/injector/qdom.py b/zeroinstall/injector/qdom.py
index d443abe..331a63f 100644
--- a/zeroinstall/injector/qdom.py
+++ b/zeroinstall/injector/qdom.py
@@ -8,7 +8,6 @@ This is our light-weight version.
 # See the README file for details, or visit http://0install.net.
 
 from xml.parsers import expat
-import sys
 
 class Element(object):
 	"""An XML element.
diff --git a/zeroinstall/injector/reader.py b/zeroinstall/injector/reader.py
index 6538eb4..3576296 100644
--- a/zeroinstall/injector/reader.py
+++ b/zeroinstall/injector/reader.py
@@ -6,18 +6,14 @@ Parses an XML interface into a Python representation.
 # See the README file for details, or visit http://0install.net.
 
 import os
-import sys
-import shutil
-import time
-from logging import debug, warn, info
+from logging import debug, info
 from os.path import dirname
 
 from zeroinstall.support import basedir
 from zeroinstall.injector import qdom, distro
-from zeroinstall.injector.namespaces import *
-from zeroinstall.injector.model import *
+from zeroinstall.injector.namespaces import config_site, config_prog, XMLNS_IFACE, injector_gui_uri
+from zeroinstall.injector.model import Interface, InvalidInterface, ZeroInstallFeed, escape, Feed, stability_levels
 from zeroinstall.injector import model
-from zeroinstall import version, SafeException
 
 def update_from_cache(interface):
 	"""Read a cached interface and any native feeds or user overrides.
diff --git a/zeroinstall/injector/run.py b/zeroinstall/injector/run.py
index 10946e0..59b29b7 100644
--- a/zeroinstall/injector/run.py
+++ b/zeroinstall/injector/run.py
@@ -8,7 +8,7 @@ Executes a set of implementations as a program.
 import os, sys
 from logging import debug, info
 
-from zeroinstall.injector.model import Interface, SafeException, EnvironmentBinding, DistributionImplementation, ZeroInstallImplementation
+from zeroinstall.injector.model import SafeException, EnvironmentBinding, ZeroInstallImplementation
 from zeroinstall.injector.iface_cache import iface_cache
 
 def do_env_binding(binding, path):
diff --git a/zeroinstall/injector/selections.py b/zeroinstall/injector/selections.py
index 39f5b77..4cf8393 100644
--- a/zeroinstall/injector/selections.py
+++ b/zeroinstall/injector/selections.py
@@ -6,10 +6,8 @@ Load and save a set of chosen implementations.
 # Copyright (C) 2007, Thomas Leonard
 # See the README file for details, or visit http://0install.net.
 
-import os
-
 from zeroinstall.injector.policy import Policy
-from zeroinstall.injector.model import EnvironmentBinding, InterfaceDependency, process_binding, process_depends, binding_names
+from zeroinstall.injector.model import process_binding, process_depends, binding_names
 from zeroinstall.injector.namespaces import XMLNS_IFACE
 from zeroinstall.injector.qdom import Element
 from zeroinstall.support import tasks
diff --git a/zeroinstall/injector/solver.py b/zeroinstall/injector/solver.py
index 26fe003..e6e85c2 100644
--- a/zeroinstall/injector/solver.py
+++ b/zeroinstall/injector/solver.py
@@ -8,7 +8,6 @@ from logging import debug, warn, info
 from zeroinstall.zerostore import BadDigest, NotStored
 
 from zeroinstall.injector.arch import machine_groups
-from zeroinstall.injector import selections
 from zeroinstall.injector import model
 
 # Copyright (C) 2008, Thomas Leonard
diff --git a/zeroinstall/injector/writer.py b/zeroinstall/injector/writer.py
index f0013c1..b73e2ed 100644
--- a/zeroinstall/injector/writer.py
+++ b/zeroinstall/injector/writer.py
@@ -10,8 +10,7 @@ from xml.dom import minidom, XMLNS_NAMESPACE
 
 from zeroinstall.support import basedir
 
-from zeroinstall.injector.model import *
-
+from zeroinstall.injector.model import escape
 from zeroinstall.injector.namespaces import config_site, config_prog, XMLNS_IFACE
 
 def _add_impl(parent, impl):
-- 
2.11.4.GIT