From f9cb8c899941fe33fa9173d671bae38d605cf3ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=C3=89vrard?= Date: Thu, 3 Mar 2016 21:54:45 +0100 Subject: [PATCH] Follow PEP-0249 for Transaction and backends issue4949 review19781002 --- address.py | 4 +--- contact_mechanism.py | 4 +--- party.py | 8 ++++---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/address.py b/address.py index 6f127d6178..3c393d7d2c 100644 --- a/address.py +++ b/address.py @@ -6,7 +6,6 @@ from sql.conditionals import Case from trytond.model import ModelView, ModelSQL, fields from trytond.pyson import Eval, If -from trytond.transaction import Transaction from trytond import backend from trytond.pool import Pool @@ -53,8 +52,7 @@ class Address(ModelSQL, ModelView): @classmethod def __register__(cls, module_name): TableHandler = backend.get('TableHandler') - cursor = Transaction().cursor - table = TableHandler(cursor, cls, module_name) + table = TableHandler(cls, module_name) super(Address, cls).__register__(module_name) diff --git a/contact_mechanism.py b/contact_mechanism.py index 32fb3145a9..35e9b6155b 100644 --- a/contact_mechanism.py +++ b/contact_mechanism.py @@ -5,7 +5,6 @@ from sql.conditionals import Case from trytond.model import ModelView, ModelSQL, fields from trytond.pyson import Eval -from trytond.transaction import Transaction from trytond import backend __all__ = ['ContactMechanism'] @@ -94,8 +93,7 @@ class ContactMechanism(ModelSQL, ModelView): @classmethod def __register__(cls, module_name): TableHandler = backend.get('TableHandler') - cursor = Transaction().cursor - table = TableHandler(cursor, cls, module_name) + table = TableHandler(cls, module_name) super(ContactMechanism, cls).__register__(module_name) diff --git a/party.py b/party.py index 49cf39d478..e8af125e35 100644 --- a/party.py +++ b/party.py @@ -71,12 +71,12 @@ class Party(ModelSQL, ModelView): pool = Pool() Property = pool.get('ir.property') TableHandler = backend.get('TableHandler') - cursor = Transaction().cursor + cursor = Transaction().connection.cursor() table = cls.__table__() super(Party, cls).__register__(module_name) - table_h = TableHandler(cursor, cls, module_name) + table_h = TableHandler(cls, module_name) if table_h.column_exist('lang'): cursor.execute(*table.select(table.id, table.lang, order_by=table.lang)) @@ -253,12 +253,12 @@ class PartyIdentifier(ModelSQL, ModelView): pool = Pool() Party = pool.get('party.party') TableHandler = backend.get('TableHandler') - cursor = Transaction().cursor + cursor = Transaction().connection.cursor() party = Party.__table__() super(PartyIdentifier, cls).__register__(module_name) - party_h = TableHandler(cursor, Party, module_name) + party_h = TableHandler(Party, module_name) if (party_h.column_exist('vat_number') and party_h.column_exist('vat_country')): identifiers = []