Changeset 2352 for pykota/trunk/cgi-bin

Timestamp:

07/10/05 13:00:16 (19 years ago)

Author:

jerome

Message:

Fix to make pykotme and pykotme.cgi work with the now external pkpgcounter.
Removed unnecessary import in pkmail.
Removed deleted files from the installation tree.
Severity: Critical if you upgraded to 1.23alpha17 already.

Files:

• pykota/trunk/cgi-bin/pykotme.cgi (modified) (2 diffs)

pykota/trunk/cgi-bin/pykotme.cgi

@@ -33 +33 @@
 from pykota import version
 from pykota.tool import PyKotaTool, PyKotaToolError
-from pykota.pdlanalyzer import PDLAnalyzer, PDLAnalyzerError
 from pykota.cgifuncs import getLanguagePreference, getCharsetPreference
+
+try :
+    from pkpgpdls import analyzer, pdlparser
+except ImportError : # TODO : Remove the try/except after release 1.24.
+    sys.stderr.write("ERROR: pkpgcounter is now distributed separately, please grab it from http://www.librelogiciel.com/software/pkpgcounter/action_Download\n")
+    
 
 header = """Content-type: text/html
@@ -141 +146 @@
         if inputfile :
             try :
-                parser = PDLAnalyzer(cStringIO.StringIO(inputfile))
+                parser = analyzer.PDLAnalyzer(cStringIO.StringIO(inputfile))
                 jobsize = parser.getJobSize()
-            except PDLAnalyzerError, msg :    
+            except pdlparser.PDLParserError, msg :    
                 self.body += '<p><font color="red">%s</font></p>' % msg
             else :