Migrate to python 3.

configuration.py

@@ -6,9 +6,8 @@ from trytond.modules.stock.configuration import default_func, default_sequence
 __all__ = ['Configuration', 'ConfigurationSequence']
 
 
-class Configuration:
+class Configuration(metaclass=PoolMeta):
     __name__ = 'stock.configuration'
-    __metaclass__ = PoolMeta
     distribution_in_sequence = fields.MultiValue(fields.Many2One('ir.sequence',
         'Supplier Distribution Sequence', domain=[
             ('company', 'in',
@@ -25,9 +24,8 @@ class Configuration:
         return super(Configuration, cls).multivalue_model(field)
 
 
-class ConfigurationSequence:
+class ConfigurationSequence(metaclass=PoolMeta):
     __name__ = 'stock.configuration.sequence'
-    __metaclass__ = PoolMeta
 
     distribution_in_sequence = fields.Many2One('ir.sequence',
         "Supplier Distribution Sequence", required=True,

distribution.py

@@ -284,7 +284,7 @@ class Distribution(Workflow, ModelSQL, ModelView):
                         break
 
                 first = True
-                for location, data in locations.iteritems():
+                for location, data in locations.items():
                     if first:
                         first = False
                         move.quantity = data['quantity']
@@ -444,9 +444,8 @@ class DistributionLine(ModelSQL, ModelView):
         return 'draft'
 
 
-class Move:
+class Move(metaclass=PoolMeta):
     __name__ = 'stock.move'
-    __metaclass__ = PoolMeta
 
     distribution = fields.Many2One('stock.distribution.in', 'Distribution')
     distribution_lines = fields.One2Many('stock.distribution.in.line', 'move',
@@ -491,9 +490,8 @@ class Move:
                 for x in self.distribution_lines if x.location])
 
 
-class Production:
+class Production(metaclass=PoolMeta):
     __name__ = 'production'
-    __metaclass__ = PoolMeta
 
     distribution_lines = fields.One2Many('stock.distribution.in.line',
         'production', 'Distribution Lines')
@@ -543,7 +541,7 @@ class Production:
                 continue
             products[product] -= line.quantity
         return '\n'.join(['%.0f     %s' % (q, p.rec_name) for p, q in
-                products.iteritems() if q > 0])
+                products.items() if q > 0])
 
     def get_distribution_pending_products(self, name):
         pool = Pool()
@@ -568,12 +566,11 @@ class Production:
                 continue
             products[product] -= line.quantity
         return '\n'.join(['%.0f     %s' % (q, p.rec_name) for p, q in
-                products.iteritems() if q > 0])
+                products.items() if q > 0])
 
 
-class Location:
+class Location(metaclass=PoolMeta):
     __name__ = 'stock.location'
-    __metaclass__ = PoolMeta
 
     distribution_lines = fields.One2Many('stock.distribution.in.line',
         'location', 'Distribution Lines')

setup.py

@@ -4,7 +4,7 @@
 from setuptools import setup
 import re
 import os
-import ConfigParser
+import configparser
 
 MODULE = 'stock_distribution_in'
 PREFIX = 'nantic'
@@ -24,7 +24,7 @@ def get_require_version(name):
         major_version, minor_version + 1)
     return require
 
-config = ConfigParser.ConfigParser()
+config = configparser.ConfigParser()
 config.readfp(open('tryton.cfg'))
 info = dict(config.items('tryton'))
 for key in ('depends', 'extras_depend', 'xml'):

tests/scenario_stock_distribution_in.rst

@@ -119,7 +119,7 @@ Create one production in wait state::
     >>> input_move.currency = company.currency
     >>> production1.click('wait')
     >>> production1.state
-    u'waiting'
+    'waiting'
 
 Create another production in draft state::
 
@@ -137,7 +137,7 @@ Create another production in draft state::
     >>> input_move.currency = company.currency
     >>> production2.save()
     >>> production2.state
-    u'draft'
+    'draft'
 
 Create purchase::
 
@@ -155,7 +155,7 @@ Create purchase::
     >>> purchase.click('confirm')
     >>> purchase.click('process')
     >>> purchase.state
-    u'processing'
+    'processing'
     >>> len(purchase.moves), len(purchase.shipment_returns), len(purchase.invoices)
     (1, 0, 0)
 
@@ -195,7 +195,7 @@ Ensure that a distribution not properly spread cannot be done::
     UserError: ...
     >>> distribution.reload()
     >>> distribution.state
-    u'draft'
+    'draft'
 
 Ensure that unlinking a move from the distribution automatically removes its
 distribution lines::
@@ -216,11 +216,11 @@ Check that when the distribution is done, everything is correct::
     >>> distribution.click('distribute')
     >>> distribution.click('do')
     >>> distribution.state
-    u'done'
+    'done'
     >>> distribution.reload()
     >>> incoming_move.reload()
     >>> incoming_move.state
-    u'done'
+    'done'
     >>> incoming_move.quantity
     8.0
     >>> line1, line2 = incoming_move.distribution_lines
@@ -230,11 +230,11 @@ Check that when the distribution is done, everything is correct::
     >>> move1.quantity + move2.quantity
     10.0
     >>> move1.state
-    u'done'
+    'done'
     >>> move1.quantity == sum([x.quantity for x in move1.distribution_lines])
     True
     >>> move2.state
-    u'done'
+    'done'
     >>> move2.quantity == sum([x.quantity for x in move2.distribution_lines])
     True
 
@@ -242,7 +242,7 @@ Check invoice lines exist::
 
     >>> purchase.reload()
     >>> purchase.shipment_state
-    u'received'
+    'received'
     >>> len(purchase.invoices)
     1
 
@@ -250,7 +250,7 @@ Check both productions have been reserved::
 
     >>> production1.reload()
     >>> production1.state
-    u'assigned'
+    'assigned'
     >>> production2.reload()
     >>> production2.state
-    u'assigned'
+    'assigned'