From 8f88e782965a3dee69e891ef49403cae1da22519 Mon Sep 17 00:00:00 2001 From: richard Date: Wed, 4 Sep 2002 01:58:33 +0000 Subject: [PATCH] fix cgi client importing git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1052 57a73879-2fb5-44c3-a270-3262357dd7e2 --- cgi-bin/roundup.cgi | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/cgi-bin/roundup.cgi b/cgi-bin/roundup.cgi index 075b1c9..d41b630 100755 --- a/cgi-bin/roundup.cgi +++ b/cgi-bin/roundup.cgi @@ -16,7 +16,7 @@ # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # -# $Id: roundup.cgi,v 1.25 2002-08-22 00:14:18 richard Exp $ +# $Id: roundup.cgi,v 1.26 2002-09-04 01:58:33 richard Exp $ # python version check from roundup import version_check @@ -99,7 +99,7 @@ def checkconfig(): if logname: LOG = open(logname, 'a') - # ROUNDUP_DEBUG is checked directly in "roundup.cgi_client" + # ROUNDUP_DEBUG is checked directly in "roundup.cgi.client" # @@ -142,20 +142,20 @@ def main(out, err): else: instance_home = ROUNDUP_INSTANCE_HOMES[instance] instance = roundup.instance.open(instance_home) - from roundup import cgi_client - client = instance.Client(instance, request, os.environ) + from roundup.cgi import client + c = instance.Client(instance, request, os.environ) try: - client.main() - except cgi_client.Unauthorised: + c.main() + except client.Unauthorised: request.send_response(403) request.send_header('Content-Type', 'text/html') request.end_headers() out.write('Unauthorised') - except cgi_client.NotFound: + except client.NotFound: request.send_response(404) request.send_header('Content-Type', 'text/html') request.end_headers() - out.write('Not found: %s'%client.path) + out.write('Not found: %s'%c.path) else: import urllib @@ -198,6 +198,9 @@ LOG.close() # # $Log: not supported by cvs2svn $ +# Revision 1.25 2002/08/22 00:14:18 richard +# Fix to be able to report errors even if the cgi module can't be imported(!) +# # Revision 1.24 2002/01/05 02:21:22 richard # fixes # -- 2.30.2