Changeset 3294 for pykota/trunk/pykota/tool.py

Timestamp:

01/18/08 23:39:41 (16 years ago)

Author:

jerome

Message:

Added modules to store utility functions and application
intialization code, which has nothing to do in classes.
Modified tool.py accordingly (far from being finished)
Use these new modules where necessary.
Now converts all command line arguments to unicode before
beginning to work. Added a proper logging method for already
encoded query strings.

Files:

• pykota/trunk/pykota/tool.py (modified) (3 diffs)

pykota/trunk/pykota/tool.py

@@ -29 +29 @@
 import getopt
 import smtplib
-import gettext
 import locale
 import socket
@@ -109 +108 @@
         self.logger = logger.openLogger("stderr")
         
-        # locale stuff
-        try :
-            locale.setlocale(locale.LC_ALL, (lang, charset))
-        except (locale.Error, IOError) :
-            locale.setlocale(locale.LC_ALL, None)
+        # Saves a copy of the locale settings
         (self.language, self.charset) = locale.getlocale()
-        self.language = self.language or "C"
-        try :
-            self.charset = self.charset or locale.getpreferredencoding()
-        except locale.Error :    
-            self.charset = sys.stdout.encoding or sys.getfilesystemencoding()
-        
-        # Dirty hack : if the charset is ASCII, we can safely use UTF-8 instead
-        # This has the advantage of allowing transparent support for recent
-        # versions of CUPS which (en-)force charset to UTF-8 when printing.
-        # This should be needed only when printing, but is probably (?) safe
-        # to do when using interactive commands.
-        if self.charset.upper() in ('ASCII', 'ANSI_X3.4-1968') :
-            self.charset = "UTF-8"
-        
-        # translation stuff
-        try :
-            try :
-                trans = gettext.translation("pykota", languages=["%s.%s" % (self.language, self.charset)], codeset=self.charset)
-            except TypeError : # Python <2.4
-                trans = gettext.translation("pykota", languages=["%s.%s" % (self.language, self.charset)])
-            trans.install(unicode=True)
-        except :
-            gettext.NullTranslations().install(unicode=True)
-    
+        
         # pykota specific stuff
         self.documentation = doc
@@ -362 +334 @@
                     # and reset the list of arguments to the lines read from
                     # the file.
-                    argsfile = open(parsed["arguments"] or parsed["A"], "r")
+                    argsfile = open(parsed["arguments"] or parsed["A"], "r") # TODO : charset decoding
                     argv = [ l.strip() for l in argsfile.readlines() ]
                     argsfile.close()