Changeset 3295 for pykota/trunk/pykota

Timestamp:

01/21/08 21:00:58 (16 years ago)

Author:

jerome

Message:

Made the CGI scripts work again.
Moved even more functions to the utils module.
Removed the cgifuncs module, moved (and changed) content into utils.
If no output encoding defined, use UTF-8 : when wget is used to try
the CGI scripts, it doesn't set by default the accepted charset and
language headers.

Location:

pykota/trunk/pykota

Files:

• cgifuncs.py (deleted)
• dumper.py (modified) (1 diff)
• tool.py (modified) (5 diffs)
• utils.py (modified) (3 diffs)

pykota/trunk/pykota/dumper.py

@@ -39 +39 @@
     hasJAXML = True
 
+from pykota.utils import *
+
 from pykota import version
-from pykota.tool import PyKotaTool, N_
+from pykota.tool import PyKotaTool
 from pykota.errors import PyKotaToolError, PyKotaCommandLineError
 

pykota/trunk/pykota/tool.py

@@ -38 +38 @@
 from mx import DateTime
 
+from pykota import utils
 from pykota.errors import PyKotaCommandLineError
 from pykota import config, storage, logger
 from pykota.version import __version__, __author__, __years__, __gplblurb__
-
-def N_(message) :
-    """Fake translation marker for translatable strings extraction."""
-    return message
-
-def crashed(message="Bug in PyKota") :    
-    """Minimal crash method."""
-    import traceback
-    lines = []
-    for line in traceback.format_exception(*sys.exc_info()) :
-        lines.extend([l for l in line.split("\n") if l])
-    msg = "ERROR: ".join(["%s\n" % l for l in (["ERROR: PyKota v%s" % __version__, message] + lines)])
-    sys.stderr.write(msg)
-    sys.stderr.flush()
-    return msg
 
 class Percent :
@@ -103 +89 @@
 class Tool :
     """Base class for tools with no database access."""
-    def __init__(self, lang="", charset=None, doc="PyKota v%(__version__)s (c) %(__years__)s %(__author__)s") :
+    def __init__(self, doc="PyKota v%(__version__)s (c) %(__years__)s %(__author__)s") :
         """Initializes the command line tool."""
         self.debug = True # in case of early failure
@@ -110 +96 @@
         # Saves a copy of the locale settings
         (self.language, self.charset) = locale.getlocale()
+        if not self.charset :
+            self.charset = "UTF-8"
         
         # pykota specific stuff
@@ -247 +235 @@
     def crashed(self, message="Bug in PyKota") :    
         """Outputs a crash message, and optionally sends it to software author."""
-        msg = crashed(message)
+        msg = utils.crashed(message)
         fullmessage = "========== Traceback :\n\n%s\n\n========== sys.argv :\n\n%s\n\n========== Environment :\n\n%s\n" % \
                         (msg, \
@@ -347 +335 @@
 class PyKotaTool(Tool) :    
     """Base class for all PyKota command line tools."""
-    def __init__(self, lang="", charset=None, doc="PyKota v%(__version__)s (c) %(__years__)s %(__author__)s") :
-        """Initializes the command line tool and opens the database."""
-        Tool.__init__(self, lang, charset, doc)
-        
     def deferredInit(self) :    
         """Deferred initialization."""

pykota/trunk/pykota/utils.py

@@ -23 +23 @@
 
 import sys
+import os
 import locale
 import gettext
@@ -63 +64 @@
     except :
         gettext.NullTranslations().install(unicode=True)
+        
+def getpreferredlanguage() :
+    """Returns the preferred language."""
+    languages = os.environ.get("HTTP_ACCEPT_LANGUAGE", "")
+    langs = [l.strip().split(';')[0] for l in languages.split(",")]
+    return langs[0].replace("-", "_")
+    
+def getpreferredcharset() :
+    """Returns the preferred charset."""
+    charsets = os.environ.get("HTTP_ACCEPT_CHARSET", "UTF-8")
+    charsets = [l.strip().split(';')[0] for l in charsets.split(",")]
+    return charsets[0]
+
+def reinitcgilocale() :        
+    """Reinitializes the locale and gettext translations for CGI scripts, according to browser's preferences."""
+    initgettext(*initlocale(getpreferredlanguage(), getpreferredcharset()))
+    
+def N_(message) :
+    """Fake translation marker for translatable strings extraction."""
+    return message
 
 def databaseToUnicode(text) :
@@ -80 +101 @@
 def logerr(text) :
     """Logs an unicode text to stderr."""
-    sys.stderr.write(text.encode(sys.stdout.encoding, "replace"))
+    sys.stderr.write(text.encode(sys.stdout.encoding or locale.getlocale()[1], \
+                                 "replace"))
+    sys.stderr.flush()
             
+def crashed(message="Bug in PyKota") :    
+    """Minimal crash method."""
+    import traceback
+    from pykota.version import __version__
+    lines = []
+    for line in traceback.format_exception(*sys.exc_info()) :
+        lines.extend([l for l in line.split("\n") if l])
+    msg = "ERROR: ".join(["%s\n" % l for l in (["ERROR: PyKota v%s" % __version__, message] + lines)])
+    logerr(msg)
+    return msg