diff cgi-bin/roundup.cgi @ 3330:b4c470ee23a4 maint-0.8

merge from HEAD
author Richard Jones <richard@users.sourceforge.net>
date Wed, 18 May 2005 05:40:43 +0000
parents ca122bc16277
children
line wrap: on
line diff
--- a/cgi-bin/roundup.cgi	Wed May 18 05:18:15 2005 +0000
+++ b/cgi-bin/roundup.cgi	Wed May 18 05:40:43 2005 +0000
@@ -16,7 +16,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: roundup.cgi,v 1.40.2.1 2005-04-13 06:11:14 richard Exp $
+# $Id: roundup.cgi,v 1.40.2.2 2005-05-18 05:40:43 richard Exp $
 
 # python version check
 from roundup import version_check
@@ -159,19 +159,19 @@
         else:
             tracker_home = TRACKER_HOMES[tracker]
             tracker = roundup.instance.open(tracker_home)
-            from roundup.cgi import client
+            import roundup.cgi.client
             if hasattr(tracker, 'Client'):
                 client = tracker.Client(tracker, request, os.environ)
             else:
-                client = client.Client(tracker, request, os.environ)
+                client = roundup.cgi.client.Client(tracker, request, os.environ)
             try:
                 client.main()
-            except client.Unauthorised:
+            except roundup.cgi.client.Unauthorised:
                 request.send_response(403)
                 request.send_header('Content-Type', 'text/html')
                 request.end_headers()
                 out.write('Unauthorised')
-            except client.NotFound:
+            except roundup.cgi.client.NotFound:
                 request.send_response(404)
                 request.send_header('Content-Type', 'text/html')
                 request.end_headers()

Roundup Issue Tracker: http://roundup-tracker.org/