Used the much nicer load_package, pointed out by Steve Majewski.

[roundup.git] / roundup-server

diff --git a/roundup-server b/roundup-server
index 52f977f4a4bb331b7a3f6358880f95bb21fc601c..b4688e0f0e88b9ca5308babacf1dd7b42cee9f5c 100755 (executable)
--- a/roundup-server
+++ b/roundup-server
@@ -3,7 +3,7 @@
 
 Stolen from CGIHTTPServer
 
-$Id: roundup-server,v 1.7 2001-08-03 00:59:34 richard Exp $
+$Id: roundup-server,v 1.8 2001-08-03 01:28:33 richard Exp $
 
 """
 import sys
@@ -98,8 +98,7 @@ class RoundupRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
         instance = urllib.unquote(l_path[1])
         if self.ROUNDUP_INSTANCE_HOMES.has_key(instance):
             instance_home = self.ROUNDUP_INSTANCE_HOMES[instance]
-            instance = imp.load_module('instance', None, instance_home,
-                ('', '', 5))
+            instance = imp.load_package('instance', instance_home)
         else:
             raise ValueError, 'No such instance "%s"'%instance
 
@@ -257,6 +256,11 @@ if __name__ == '__main__':
 
 #
 # $Log: not supported by cvs2svn $
+# 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
+# names.
+#
 # Revision 1.6  2001/07/29 07:01:39  richard
 # Added vim command to all source so that we don't get no steenkin' tabs :)
 #