From d12900431308ee978c039567fd5c6a407d10c0e5 Mon Sep 17 00:00:00 2001 From: Albert Cervera i Areny Date: Fri, 24 Aug 2018 12:24:30 +0200 Subject: [PATCH] Migrate to python 3 --- configuration.py | 3 +-- setup.py | 5 +---- shipment.py | 9 +++------ 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/configuration.py b/configuration.py index cc912a3..e4899eb 100644 --- a/configuration.py +++ b/configuration.py @@ -8,8 +8,7 @@ from trytond.modules.company.model import CompanyValueMixin __all_ = ['Configuration', 'StockConfigurationCompany'] -class Configuration: - __metaclass__ = PoolMeta +class Configuration(metaclass=PoolMeta): __name__ = 'stock.configuration' shipment_qty_decimal = fields.MultiValue(fields.Boolean( diff --git a/setup.py b/setup.py index 9e268b1..5e78f4d 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 = 'stock_delivery_note_jreport' PREFIX = 'trytonzz' diff --git a/shipment.py b/shipment.py index 361e673..efe361a 100644 --- a/shipment.py +++ b/shipment.py @@ -9,8 +9,7 @@ __all__ = ['DeliveryNote', 'PickingList', 'DeliveryNoteReturn', 'DeliveryNoteValued'] -class DeliveryNote(JasperReport): - __metaclass__ = PoolMeta +class DeliveryNote(JasperReport, metaclass=PoolMeta): __name__ = 'stock.shipment.out.delivery_note' @classmethod @@ -29,8 +28,7 @@ class DeliveryNote(JasperReport): return super(DeliveryNote, cls).execute(ids, data) -class PickingList(JasperReport): - __metaclass__ = PoolMeta +class PickingList(JasperReport, metaclass=PoolMeta): __name__ = 'stock.shipment.out.picking_list' @classmethod @@ -49,8 +47,7 @@ class PickingList(JasperReport): return super(PickingList, cls).execute(ids, data) -class DeliveryNoteReturn(JasperReport): - __metaclass__ = PoolMeta +class DeliveryNoteReturn(JasperReport, metaclass=PoolMeta): __name__ = 'stock.shipment.out.delivery_note.return' @classmethod