From e59e421726ad41c686a6e1a0edf7d348761f39a4 Mon Sep 17 00:00:00 2001 From: Raimon Esteve Date: Sat, 15 Sep 2018 18:11:46 +0200 Subject: [PATCH] Migrate to py3 --- __init__.py | 1 - product.py | 7 ++----- setup.py | 5 +---- shop.py | 4 +--- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/__init__.py b/__init__.py index 9522348..14530ac 100644 --- a/__init__.py +++ b/__init__.py @@ -1,7 +1,6 @@ # This file is part of product_special_price module for Tryton. # The COPYRIGHT file at the top level of this repository contains the full # copyright notices and license terms. - from trytond.pool import Pool from . import shop from . import product diff --git a/product.py b/product.py index 40946ea..271bce9 100644 --- a/product.py +++ b/product.py @@ -19,8 +19,7 @@ STATES = { DEPENDS = ['active'] -class Template: - __metaclass__ = PoolMeta +class Template(metaclass=PoolMeta): __name__ = 'product.template' special_price = fields.MultiValue(fields.Numeric( "Special Price", digits=price_digits, @@ -41,7 +40,6 @@ class Template: class ProductSpecialPrice(ModelSQL, CompanyValueMixin): "Product Special Price" __name__ = 'product.special_price' - template = fields.Many2One( 'product.template', "Template", ondelete='CASCADE', select=True) special_price = fields.Numeric("Special Price", digits=price_digits) @@ -66,8 +64,7 @@ class ProductSpecialPrice(ModelSQL, CompanyValueMixin): parent='template', fields=fields) -class Product: - __metaclass__ = PoolMeta +class Product(metaclass=PoolMeta): __name__ = 'product.product' @classmethod diff --git a/setup.py b/setup.py index 7175135..ec047bf 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 MODULE = 'product_special_price' PREFIX = 'trytonzz' diff --git a/shop.py b/shop.py index af9121e..3b0fc9c 100644 --- a/shop.py +++ b/shop.py @@ -8,10 +8,8 @@ from trytond.pyson import Eval __all__ = ['SaleShop'] -class SaleShop: - __metaclass__ = PoolMeta +class SaleShop(metaclass=PoolMeta): __name__ = 'sale.shop' - special_price = fields.Boolean('Apply Special Price') type_special_price = fields.Selection([ ('price', 'Special Price'),