[FIX]Fixed the issue of translation for node which has avg.

[odoo/odoo.git] / openerp / loglevels.py

diff --git a/openerp/loglevels.py b/openerp/loglevels.py
index eb09f42..29bd6e5 100644 (file)
--- a/openerp/loglevels.py
+++ b/openerp/loglevels.py
@@ -21,12 +21,8 @@
 
 import sys
 import logging
-import warnings
 
 LOG_NOTSET = 'notset'
-LOG_DEBUG_SQL = 'debug_sql'
-LOG_DEBUG_RPC_ANSWER = 'debug_rpc_answer'
-LOG_DEBUG_RPC = 'debug_rpc'
 LOG_DEBUG = 'debug'
 LOG_TEST = 'test'
 LOG_INFO = 'info'
@@ -34,32 +30,27 @@ LOG_WARNING = 'warn'
 LOG_ERROR = 'error'
 LOG_CRITICAL = 'critical'
 
-logging.DEBUG_RPC_ANSWER = logging.DEBUG - 4
-logging.addLevelName(logging.DEBUG_RPC_ANSWER, 'DEBUG_RPC_ANSWER')
-logging.DEBUG_RPC = logging.DEBUG - 2
-logging.addLevelName(logging.DEBUG_RPC, 'DEBUG_RPC')
-logging.DEBUG_SQL = logging.DEBUG_RPC - 3
-logging.addLevelName(logging.DEBUG_SQL, 'DEBUG_SQL')
-
 logging.TEST = logging.INFO - 5
 logging.addLevelName(logging.TEST, 'TEST')
 
+_logger = logging.getLogger(__name__)
+
 class Logger(object):
     def __init__(self):
-        warnings.warn("The netsvc.Logger API shouldn't be used anymore, please "
-                      "use the standard `logging.getLogger` API instead",
-                      PendingDeprecationWarning, stacklevel=2)
+        _logger.warning(
+            "The netsvc.Logger API shouldn't be used anymore, please "
+            "use the standard `logging.getLogger` API instead.")
         super(Logger, self).__init__()
 
     def notifyChannel(self, name, level, msg):
-        warnings.warn("notifyChannel API shouldn't be used anymore, please use "
-                      "the standard `logging` module instead",
-                      PendingDeprecationWarning, stacklevel=2)
+        _logger.warning(
+            "notifyChannel API shouldn't be used anymore, please use "
+            "the standard `logging` module instead.")
         from service.web_services import common
 
-        log = logging.getLogger(ustr(name))
+        log = logging.getLogger(__name__ + '.deprecated.' + ustr(name))
 
-        if level in [LOG_DEBUG_RPC, LOG_TEST] and not hasattr(log, level):
+        if level in [LOG_TEST] and not hasattr(log, level):
             fct = lambda msg, *args, **kwargs: log.log(getattr(logging, level.upper()), msg, *args, **kwargs)
             setattr(log, level, fct)
 
@@ -108,27 +99,27 @@ class Logger(object):
 
 def get_encodings(hint_encoding='utf-8'):
     fallbacks = {
-       'latin1': 'latin9',
-       'iso-8859-1': 'iso8859-15',
-       'cp1252': '1252',
+        'latin1': 'latin9',
+        'iso-8859-1': 'iso8859-15',
+        'cp1252': '1252',
     }
     if hint_encoding:
-       yield hint_encoding
-       if hint_encoding.lower() in fallbacks:
-           yield fallbacks[hint_encoding.lower()]
+        yield hint_encoding
+        if hint_encoding.lower() in fallbacks:
+            yield fallbacks[hint_encoding.lower()]
 
     # some defaults (also taking care of pure ASCII)
     for charset in ['utf8','latin1']:
-       if not (hint_encoding) or (charset.lower() != hint_encoding.lower()):
-           yield charset
+        if not (hint_encoding) or (charset.lower() != hint_encoding.lower()):
+            yield charset
 
     from locale import getpreferredencoding
     prefenc = getpreferredencoding()
     if prefenc and prefenc.lower() != 'utf-8':
-       yield prefenc
-       prefenc = fallbacks.get(prefenc.lower())
-       if prefenc:
-           yield prefenc
+        yield prefenc
+        prefenc = fallbacks.get(prefenc.lower())
+        if prefenc:
+            yield prefenc
 
 def ustr(value, hint_encoding='utf-8'):
     """This method is similar to the builtin `str` method, except
@@ -136,40 +127,40 @@ def ustr(value, hint_encoding='utf-8'):
 
     @param value: the value to convert
     @param hint_encoding: an optional encoding that was detected
-                         upstream and should be tried first to
-                         decode ``value``.
+                          upstream and should be tried first to
+                          decode ``value``.
 
     @rtype: unicode
     @return: unicode string
     """
     if isinstance(value, Exception):
-       return exception_to_unicode(value)
+        return exception_to_unicode(value)
 
     if isinstance(value, unicode):
-       return value
+        return value
 
     if not isinstance(value, basestring):
-       try:
-           return unicode(value)
-       except Exception:
-           raise UnicodeError('unable to convert %r' % (value,))
+        try:
+            return unicode(value)
+        except Exception:
+            raise UnicodeError('unable to convert %r' % (value,))
 
     for ln in get_encodings(hint_encoding):
-       try:
-           return unicode(value, ln)
-       except Exception:
-           pass
+        try:
+            return unicode(value, ln)
+        except Exception:
+            pass
     raise UnicodeError('unable to convert %r' % (value,))
 
 
 def exception_to_unicode(e):
     if (sys.version_info[:2] < (2,6)) and hasattr(e, 'message'):
-       return ustr(e.message)
+        return ustr(e.message)
     if hasattr(e, 'args'):
-       return "\n".join((ustr(a) for a in e.args))
+        return "\n".join((ustr(a) for a in e.args))
     try:
-       return ustr(e)
+        return unicode(e)
     except Exception:
-       return u"Unknown message"
+        return u"Unknown message"
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: