From 015d2ae88b41c7315b9aa71b97b6b326094d04c2 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 29 Sep 2011 00:13:44 +0200 Subject: [PATCH] [FIX] remove openerpdispatch openerlib need to catch openerp.exceptions.* and raise as openerplib.exceptions.* bzr revid: al@openerp.com-20110928221344-z2e9ve48js0fi4be --- addons/web/common/openerplib/main.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/web/common/openerplib/main.py b/addons/web/common/openerplib/main.py index dfc310b567b..53ced4a93d7 100644 --- a/addons/web/common/openerplib/main.py +++ b/addons/web/common/openerplib/main.py @@ -38,6 +38,7 @@ Code repository: https://code.launchpad.net/~niv-openerp/openerp-client-lib/trun import xmlrpclib import logging import socket +import sys try: import cPickle as pickle @@ -208,10 +209,7 @@ class LocalConnector(Connector): # OpenERPWarning code 1 # OpenERPException code 2 try: - result = openerp.netsvc.dispatch_rpc(service_name, method, args, None) - except openerp.netsvc.OpenERPDispatcherException, e: - fault = xmlrpclib.Fault(openerp.tools.exception_to_unicode(e.exception), e.traceback) - raise fault + result = openerp.netsvc.dispatch_rpc(service_name, method, args) except: exc_type, exc_value, exc_tb = sys.exc_info() fault = xmlrpclib.Fault(1, "%s:%s" % (exc_type, exc_value))