openerp-dev-web team mailing list archive

["Naresh\(OpenERP\)" <nch@xxxxxxxxxxx>]

Naresh(OpenERP) has proposed merging lp:~openerp-dev/openobject-server/trunk-bug-675826-nch into lp:openobject-server.

Requested reviews:
  Vo Minh Thu (OpenERP) (vmt-openerp)
Related bugs:
  Bug #675826 in OpenERP Server: "AttributeError: 'bool' object has no attribute 'upper'"
  https://bugs.launchpad.net/openobject-server/+bug/675826

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-675826-nch/+merge/60349
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-675826-nch/+merge/60349
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/trunk-bug-675826-nch.

=== modified file 'openerp/tools/config.py'
--- openerp/tools/config.py	2011-04-18 13:10:23 +0000
+++ openerp/tools/config.py	2011-05-09 09:45:57 +0000
@@ -32,7 +32,7 @@
     try:
         from OpenSSL import SSL
         import socket
-        
+
         return hasattr(socket, 'ssl') and hasattr(SSL, "Connection")
     except:
         return False
@@ -349,7 +349,8 @@
         self.options['update'] = opt.update and dict.fromkeys(opt.update.split(','), 1) or {}
         self.options['translate_modules'] = opt.translate_modules and map(lambda m: m.strip(), opt.translate_modules.split(',')) or ['all']
         self.options['translate_modules'].sort()
-
+        die(self.options['timezone'] and not isinstance(self.options['timezone'], basestring),
+            "Invalid timezone value in configuration or environment: %r, Please fix this in your configuration" %(self.options['timezone']))
         if self.options['timezone']:
             # If an explicit TZ was provided in the config, make sure it is known
             try:

=== modified file 'openerp/tools/misc.py'
--- openerp/tools/misc.py	2011-03-28 07:59:20 +0000
+++ openerp/tools/misc.py	2011-05-09 09:45:57 +0000
@@ -159,7 +159,7 @@
     if not prog:
         raise Exception('Couldn\'t find %s' % name)
     args2 = (prog,) + args
-    
+
     return subprocess.call(args2)
 
 def exec_pg_command_pipe(name, *args):