Christophe (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-except_ormsv-chs into
lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-except_ormsv-chs/+merge/131623
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-except_ormsv-chs/+merge/131623
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-except_ormsv-chs.
=== modified file 'openerp/addons/base/res/ir_property.py'
--- openerp/addons/base/res/ir_property.py 2012-03-22 16:58:37 +0000
+++ openerp/addons/base/res/ir_property.py 2012-10-26 13:59:25 +0000
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv,fields
+from osv import orm, osv, fields
from tools.misc import attrgetter
import time
@@ -110,7 +110,7 @@
raise osv.except_osv('Error', 'Invalid type')
if field == 'value_reference':
- if isinstance(value, osv.orm.browse_record):
+ if isinstance(value, orm.browse_record):
value = '%s,%d' % (value._name, value.id)
elif isinstance(value, (int, long)):
field_id = values.get('fields_id')
=== modified file 'openerp/osv/__init__.py'
--- openerp/osv/__init__.py 2011-06-23 09:03:57 +0000
+++ openerp/osv/__init__.py 2012-10-26 13:59:25 +0000
@@ -19,6 +19,7 @@
#
##############################################################################
+import orm
import osv
import fields
=== modified file 'openerp/osv/osv.py'
--- openerp/osv/osv.py 2012-09-28 16:52:39 +0000
+++ openerp/osv/osv.py 2012-10-26 13:59:25 +0000
@@ -25,24 +25,14 @@
import logging
from psycopg2 import IntegrityError, errorcodes
-import orm
-import openerp
import openerp.netsvc as netsvc
import openerp.pooler as pooler
import openerp.sql_db as sql_db
from openerp.tools.translate import translate
-from openerp.osv.orm import MetaModel, Model, TransientModel, AbstractModel
-import openerp.exceptions
+from openerp.osv.orm import Model, TransientModel, AbstractModel, except_orm
_logger = logging.getLogger(__name__)
-# Deprecated.
-class except_osv(Exception):
- def __init__(self, name, value):
- self.name = name
- self.value = value
- self.args = (name, value)
-
service = None
class object_proxy(object):
@@ -119,9 +109,7 @@
if pooler.get_pool(dbname)._init:
raise except_osv('Database not ready', 'Currently, this database is not fully loaded and can not be used.')
return f(self, dbname, *args, **kwargs)
- except orm.except_orm, inst:
- raise except_osv(inst.name, inst.value)
- except except_osv:
+ except except_orm:
raise
except IntegrityError, inst:
osv_pool = pooler.get_pool(dbname)
@@ -208,6 +196,7 @@
osv = Model
osv_memory = TransientModel
osv_abstract = AbstractModel # ;-)
+except_osv = except_orm
def start_object_proxy():
=== modified file 'openerp/service/web_services.py'
--- openerp/service/web_services.py 2012-10-04 07:44:20 +0000
+++ openerp/service/web_services.py 2012-10-26 13:59:25 +0000
@@ -360,7 +360,6 @@
def exp_migrate_databases(self,databases):
from openerp.osv.orm import except_orm
- from openerp.osv.osv import except_osv
for db in databases:
try:
@@ -369,8 +368,6 @@
pooler.restart_pool(db, force_demo=False, update_module=True)
except except_orm, inst:
netsvc.abort_response(1, inst.name, 'warning', inst.value)
- except except_osv, inst:
- netsvc.abort_response(1, inst.name, 'warning', inst.value)
except Exception:
_logger.exception('Exception in migrate_databases:')
raise
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
