From c55a3788164843ff473cd5fe547a2f599d22a84b Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Sun, 29 May 2005 12:01:26 +0000
Subject: [PATCH] Use local injector library, with full package names.

Suppress deprecation warning when downloading.

git-svn-id: file:///home/talex/Backups/sf.net/Subversion/zero-install/injector/head/injector-gui@246 9f8c893c-44ee-0310-b757-c8ca8341c71e
---
 0launch-gui      | 2 +-
 download_box.py  | 8 +++++---
 gui.py           | 8 ++++----
 iface_browser.py | 2 +-
 impl_list.py     | 3 +--
 mainwindow.py    | 2 +-
 properties.py    | 4 ++--
 trust_box.py     | 2 +-
 8 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/0launch-gui b/0launch-gui
index 2240702..524bdbe 100755
--- a/0launch-gui
+++ b/0launch-gui
@@ -19,7 +19,7 @@ if len(args) < 1:
 interface_uri = args[0]
 prog_args = args[1:]
 
-import model
+from zeroinstall.injector import model
 from gui import GUIPolicy
 import gui, gtk
 
diff --git a/download_box.py b/download_box.py
index a22c39d..ed62932 100644
--- a/download_box.py
+++ b/download_box.py
@@ -1,11 +1,13 @@
 import gtk
 import os
 
-from model import SafeException
+from zeroinstall.injector.model import SafeException
+from zeroinstall.injector import download
 from gui import policy, pretty_size
 from dialog import Dialog
-import download
-import dialog
+
+import warnings
+warnings.filterwarnings('ignore', category = DeprecationWarning, module='download_box')
 
 def download_with_gui(mainwindow, prog_args, run_afterwards):
 	"""If all downloads are ready, runs the program. Otherwise,
diff --git a/gui.py b/gui.py
index fd291d2..26ccce5 100644
--- a/gui.py
+++ b/gui.py
@@ -1,10 +1,10 @@
 import gtk, os, gobject
 
-from policy import Policy
-import download
+from zeroinstall.injector.policy import Policy
+from zeroinstall.injector import download
+from zeroinstall.injector.model import SafeException
+from zeroinstall.injector.reader import InvalidInterface
 import dialog
-from reader import InvalidInterface
-from model import SafeException
 
 # Singleton Policy
 policy = None
diff --git a/iface_browser.py b/iface_browser.py
index f4f48ee..9eef647 100644
--- a/iface_browser.py
+++ b/iface_browser.py
@@ -1,6 +1,6 @@
 import gtk
 
-from model import Interface
+from zeroinstall.injector.model import Interface
 import properties
 from gui import policy, pretty_size
 
diff --git a/impl_list.py b/impl_list.py
index 68e5193..8b22af1 100644
--- a/impl_list.py
+++ b/impl_list.py
@@ -1,7 +1,6 @@
 import gtk
-import model
+from zeroinstall.injector import model, writer
 from gui import policy, pretty_size
-import writer
 
 def popup_menu(bev, values, fn):
 	menu = gtk.Menu()
diff --git a/mainwindow.py b/mainwindow.py
index 709f9a9..96ffd9e 100644
--- a/mainwindow.py
+++ b/mainwindow.py
@@ -4,7 +4,7 @@ from iface_browser import InterfaceBrowser
 import help_box
 from gui import policy
 from dialog import Dialog
-from model import stable, testing, network_levels, SafeException
+from zeroinstall.injector.model import stable, testing, network_levels, SafeException
 from freshness import freshness_levels, Freshness
 
 class MainWindow(Dialog):
diff --git a/properties.py b/properties.py
index e23978f..2243dac 100644
--- a/properties.py
+++ b/properties.py
@@ -1,11 +1,11 @@
-from model import *
+from zeroinstall.injector.model import *
+from zeroinstall.injector import writer
 import gtk
 
 import help_box
 from dialog import Dialog
 from gui import policy
 from impl_list import ImplementationList
-import writer
 import time
 
 _dialogs = {}	# Interface -> Properties
diff --git a/trust_box.py b/trust_box.py
index ed04fee..c3352e2 100644
--- a/trust_box.py
+++ b/trust_box.py
@@ -1,5 +1,5 @@
 import gtk
-from model import SafeException
+from zeroinstall.injector.model import SafeException
 
 import gui
 import dialog
-- 
2.11.4.GIT