From a303de53b80d28eeb548dc55fbd543bf9f998440 Mon Sep 17 00:00:00 2001
From: richard <richard@57a73879-2fb5-44c3-a270-3262357dd7e2>
Date: Wed, 4 Sep 2002 02:11:00 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1056 57a73879-2fb5-44c3-a270-3262357dd7e2
---
 cgi-bin/roundup.cgi            | 17 ++++++++++-------
 frontends/ZRoundup/ZRoundup.py |  7 +++++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/cgi-bin/roundup.cgi b/cgi-bin/roundup.cgi
index d41b630..a34cf3a 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.26 2002-09-04 01:58:33 richard Exp $
+# $Id: roundup.cgi,v 1.27 2002-09-04 02:11:00 richard Exp $
 
 # python version check
 from roundup import version_check
@@ -142,20 +142,20 @@ def main(out, err):
         else:
             instance_home = ROUNDUP_INSTANCE_HOMES[instance]
             instance = roundup.instance.open(instance_home)
-            from roundup.cgi import client
-            c = instance.Client(instance, request, os.environ)
+            from roundup.cgi.client import Unauthorised, NotFound
+            client = instance.Client(instance, request, os.environ)
             try:
-                c.main()
-            except client.Unauthorised:
+                client.main()
+            except Unauthorised:
                 request.send_response(403)
                 request.send_header('Content-Type', 'text/html')
                 request.end_headers()
                 out.write('Unauthorised')
-            except client.NotFound:
+            except NotFound:
                 request.send_response(404)
                 request.send_header('Content-Type', 'text/html')
                 request.end_headers()
-                out.write('Not found: %s'%c.path)
+                out.write('Not found: %s'%client.path)
 
     else:
         import urllib
@@ -198,6 +198,9 @@ LOG.close()
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.26  2002/09/04 01:58:33  richard
+# fix cgi client importing
+#
 # 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(!)
 #
diff --git a/frontends/ZRoundup/ZRoundup.py b/frontends/ZRoundup/ZRoundup.py
index 0be45f3..f9f6bd4 100644
--- a/frontends/ZRoundup/ZRoundup.py
+++ b/frontends/ZRoundup/ZRoundup.py
@@ -14,7 +14,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: ZRoundup.py,v 1.10 2002-09-04 02:05:19 richard Exp $
+# $Id: ZRoundup.py,v 1.11 2002-09-04 02:11:00 richard Exp $
 #
 ''' ZRoundup module - exposes the roundup web interface to Zope
 
@@ -45,7 +45,7 @@ from AccessControl import ModuleSecurityInfo
 modulesecurity = ModuleSecurityInfo()
 
 import roundup.instance
-from roundup.cgi import NotFound
+from roundup.cgi.client import NotFound
 
 modulesecurity.declareProtected('View management screens',
     'manage_addZRoundupForm')
@@ -208,6 +208,9 @@ modulesecurity.apply(globals())
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.10  2002/09/04 02:05:19  richard
+# new cgi client here too
+#
 # Revision 1.9  2002/07/04 01:25:22  dman13
 # fixed #576086 (dumb copying mistake)
 #
-- 
2.30.2