From b48f3318d9ce134df627e4136eb679b5e8b08e46 Mon Sep 17 00:00:00 2001 From: Albert Cervera i Areny Date: Mon, 3 Sep 2018 23:37:02 +0200 Subject: [PATCH] Migrate to python 3 --- sale.py | 3 +-- setup.py | 5 +---- statement.py | 9 +++------ user.py | 3 +-- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/sale.py b/sale.py index 7a51271..e5abbca 100644 --- a/sale.py +++ b/sale.py @@ -18,8 +18,7 @@ __all__ = ['Sale', 'SalePaymentForm', 'WizardSalePayment', 'WizardSaleReconcile'] -class Sale: - __metaclass__ = PoolMeta +class Sale(metaclass=PoolMeta): __name__ = 'sale.sale' payments = fields.One2Many('account.statement.line', 'sale', 'Payments') paid_amount = fields.Function(fields.Numeric('Paid Amount', readonly=True), diff --git a/setup.py b/setup.py index a47ab08..457298b 100644 --- a/setup.py +++ b/setup.py @@ -7,10 +7,7 @@ from setuptools import setup import re import os import io -try: - from configparser import ConfigParser -except ImportError: - from ConfigParser import ConfigParser +from configparser import ConfigParser MODULE2PREFIX = {} diff --git a/statement.py b/statement.py index 8e88f49..6e49dd1 100644 --- a/statement.py +++ b/statement.py @@ -12,14 +12,12 @@ __all__ = ['Journal', 'Statement', 'Line', 'OpenStatementStart', 'CloseStatementDone', 'CloseStatement'] -class Journal: - __metaclass__ = PoolMeta +class Journal(metaclass=PoolMeta): __name__ = 'account.statement.journal' devices = fields.One2Many('sale.device', 'journal', 'Devices') -class Statement: - __metaclass__ = PoolMeta +class Statement(metaclass=PoolMeta): __name__ = 'account.statement' users = fields.Function(fields.One2Many('res.user', None, 'Users'), 'get_users', searcher='search_users') @@ -58,8 +56,7 @@ class Statement: return [('id', 'in', query)] -class Line: - __metaclass__ = PoolMeta +class Line(metaclass=PoolMeta): __name__ = 'account.statement.line' sale = fields.Many2One('sale.sale', 'Sale', ondelete='RESTRICT') diff --git a/user.py b/user.py index ffa0560..6f23be1 100644 --- a/user.py +++ b/user.py @@ -10,8 +10,7 @@ from trytond.pyson import Eval __all__ = ['User'] -class User: - __metaclass__ = PoolMeta +class User(metaclass=PoolMeta): __name__ = "res.user" sale_device = fields.Many2One('sale.device', 'Sale Device', domain=[('shop', '=', Eval('shop'))],