Changeset 2352

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.

Location:

pykota/trunk

Files:

• bin/pkmail (modified) (1 diff)
• bin/pykotme (modified) (2 diffs)
• cgi-bin/pykotme.cgi (modified) (2 diffs)
• MANIFEST.in (modified) (1 diff)
• setup.py (modified) (1 diff)

pykota/trunk/bin/pkmail

@@ -32 +32 @@
 
 from pykota.tool import PyKotaTool, PyKotaToolError, crashed, N_
-from pykota.pdlanalyzer import PDLAnalyzer, PDLAnalyzerError
-
+    
 __doc__ = N_("""pkmail v%(__version__)s (c) %(__years__)s %(__author__)s
 

pykota/trunk/bin/pykotme

@@ -30 +30 @@
 
 from pykota.tool import PyKotaTool, PyKotaToolError, crashed, N_
-from pykota.pdlanalyzer import PDLAnalyzer, PDLAnalyzerError
+
+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")
+    
 
 __doc__ = N_("""pykotme v%(__version__)s (c) %(__years__)s %(__author__)s
@@ -84 +89 @@
         for filename in files :    
             try :
-                parser = PDLAnalyzer(filename)
+                parser = analyzer.PDLAnalyzer(filename)
                 totalsize += parser.getJobSize()
-            except PDLAnalyzerError, msg :    
+            except pdlparser.PDLParserError, msg :    
                 self.printInfo(msg)
             

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 :    

pykota/trunk/MANIFEST.in

@@ -1 @@
-include README FAQ COPYING LICENSE TODO NEWS CREDITS SECURITY MANIFEST.in clean.sh checkdeps.py bin/pkmail bin/pkbanner bin/autopykota bin/dumpykota bin/lprngpykota bin/cupspykota bin/edpykota bin/warnpykota bin/repykota bin/pykotme bin/pykosd bin/pkprinters bin/pkhint bin/pkbcodes bin/snmpprinterstatus bin/waitprinter.sh bin/papwaitprinter.sh bin/mailandpopup.sh bin/README
+include README FAQ COPYING LICENSE TODO NEWS CREDITS SECURITY MANIFEST.in clean.sh checkdeps.py bin/pkmail bin/pkbanner bin/autopykota bin/dumpykota bin/lprngpykota bin/cupspykota bin/edpykota bin/warnpykota bin/repykota bin/pykotme bin/pykosd bin/pkprinters bin/pkhint bin/pkbcodes bin/waitprinter.sh bin/papwaitprinter.sh bin/mailandpopup.sh bin/README
 recursive-include po README *.sh *.po *.mo *.pot
 recursive-include man README *.sh *.1

pykota/trunk/setup.py

@@ -101 +101 @@
       url = "http://www.librelogiciel.com/software/",
       packages = [ "pykota", "pykota.storages", "pykota.loggers", "pykota.accounters", "pykota.reporters" ],
-      scripts = [ "bin/pkbcodes", "bin/pkmail", "bin/pkbanner", "bin/autopykota", "bin/dumpykota", "bin/snmpprinterstatus", "bin/pykosd", "bin/edpykota", "bin/repykota", "bin/warnpykota", "bin/pykotme", "bin/pkprinters", "bin/pkhint" ],
+      scripts = [ "bin/pkbcodes", "bin/pkmail", "bin/pkbanner", "bin/autopykota", "bin/dumpykota", "bin/pykosd", "bin/edpykota", "bin/repykota", "bin/warnpykota", "bin/pykotme", "bin/pkprinters", "bin/pkhint" ],
       data_files = data_files)