--- a/roundup-server	Sun Aug 05 07:07:58 2001 +0000
+++ b/roundup-server	Sun Aug 05 07:44:36 2001 +0000
@@ -3,7 +3,7 @@
 
 Stolen from CGIHTTPServer
 
-$Id: roundup-server,v 1.8 2001-08-03 01:28:33 richard Exp $
+$Id: roundup-server,v 1.9 2001-08-05 07:44:36 richard Exp $
 
 """
 import sys
@@ -22,6 +22,7 @@
 
 # Roundup modules of use here
 from roundup import cgitb, cgi_client
+import roundup.instance
 
 #
 ##  Configuration
@@ -98,7 +99,7 @@
         instance = urllib.unquote(l_path[1])
         if self.ROUNDUP_INSTANCE_HOMES.has_key(instance):
             instance_home = self.ROUNDUP_INSTANCE_HOMES[instance]
-            instance = imp.load_package('instance', instance_home)
+            instance = roundup.instance.open(instance_home)
         else:
             raise ValueError, 'No such instance "%s"'%instance
 
@@ -256,6 +257,9 @@
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.8  2001/08/03 01:28:33  richard
+# Used the much nicer load_package, pointed out by Steve Majewski.
+#
 # Revision 1.7  2001/08/03 00:59:34  richard
 # Instance import now imports the instance using imp.load_module so that
 # we can have instance homes of "roundup" or other existing python package