[MRG] merge trunk.

bzr revid: florent.xicluna@gmail.com-20120208141358-emgwspa0s58gtsez

diff --cc openerp-server
Simple merge

diff --cc openerp/netsvc.py
index 53750ed,3491881..7f84330
--- 1/openerp/netsvc.py
--- 2/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@@ -198,12 -236,12 +236,12 @@@ def init_logger()
  # server intended to test it.
  def init_alternative_logger():
      class H(logging.Handler):
 -      def emit(self, record):
 -        if record.levelno > 20:
 -          print record.levelno, record.pathname, record.msg
 +        def emit(self, record):
 +            if record.levelno > 20:
 +                print record.levelno, record.pathname, record.msg
      handler = H()
-     logger = logging.getLogger()
-     logger.handlers = []
+     # Add the handler to the 'openerp' logger.
+     logger = logging.getLogger('openerp')
      logger.addHandler(handler)
      logger.setLevel(logging.ERROR)
  

diff --cc openerp/osv/fields.py
index ff02a8c,224c4be..7e225dd
--- 1/openerp/osv/fields.py
--- 2/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@@ -34,8 -34,10 +34,8 @@@
  
  import base64
  import datetime as DT
+ import logging
  import re
- import warnings
 -import string
 -import sys
  import xmlrpclib
  from psycopg2 import Binary
  

diff --cc openerp/osv/orm.py
Simple merge

diff --cc openerp/service/netrpc_server.py
index efe2690,3252887..327ebc5
--- 1/openerp/service/netrpc_server.py
--- 2/openerp/service/netrpc_server.py
+++ b/openerp/service/netrpc_server.py
@@@ -125,13 -126,12 +126,12 @@@ class TinySocketServerThread(threading.
                  ct.start()
                  lt = len(self.threads)
                  if (lt > 10) and (lt % 10 == 0):
 -                     # Not many threads should be serving at the same time, so log
 -                     # their abuse.
 -                     _logger.debug("Netrpc: %d threads", len(self.threads))
 +                    # Not many threads should be serving at the same time, so log
 +                    # their abuse.
-                     netsvc.Logger().notifyChannel("web-services", netsvc.LOG_DEBUG,
-                         "Netrpc: %d threads" % len(self.threads))
++                    _logger.debug("Netrpc: %d threads", len(self.threads))
              self.socket.close()
          except Exception, e:
-             logging.getLogger('web-services').warning("Netrpc: closing because of exception %s" % str(e))
+             _logger.warning("Netrpc: closing because of exception %s" % str(e))
              self.socket.close()
              return False
  

diff --cc openerp/service/web_services.py
Simple merge