From 130003f5e2153a0c2c7dbf5471b22d56e42a336b Mon Sep 17 00:00:00 2001
From: Albert Cervera i Areny <albert@nan-tic.com>
Date: Fri, 17 Aug 2018 18:51:03 +0200
Subject: [PATCH] Migrate to python 3.

---
 activity.py                 |  3 +--
 bank.py                     |  6 ++----
 carrier.py                  |  3 +--
 employee.py                 |  3 +--
 party.py                    | 12 ++++--------
 setup.py                    |  5 +----
 tests/test_party_company.py |  4 ++--
 user.py                     |  7 +++----
 8 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/activity.py b/activity.py
index e938c41..9a0cf44 100644
--- a/activity.py
+++ b/activity.py
@@ -6,8 +6,7 @@ from . import party
 __all__ = ['Activity']
 
 
-class Activity(party.PartyCompanyMixin):
-    __metaclass__ = PoolMeta
+class Activity(party.PartyCompanyMixin, metaclass=PoolMeta):
     __name__ = "activity.activity"
 
     @classmethod
diff --git a/bank.py b/bank.py
index ba1b551..987c59a 100644
--- a/bank.py
+++ b/bank.py
@@ -7,13 +7,11 @@ from . import party
 __all__ = ['Bank', 'BankAccount']
 
 
-class Bank(party.PartyCompanyMixin):
-    __metaclass__ = PoolMeta
+class Bank(party.PartyCompanyMixin, metaclass=PoolMeta):
     __name__ = "bank"
 
 
-class BankAccount:
-    __metaclass__ = PoolMeta
+class BankAccount(metaclass=PoolMeta):
     __name__ = 'bank.account'
     companies = fields.Function(fields.One2Many('company.company', None,
         'Companies'), 'get_companies', searcher='search_companies')
diff --git a/carrier.py b/carrier.py
index b952494..e1f87d1 100644
--- a/carrier.py
+++ b/carrier.py
@@ -6,6 +6,5 @@ from . import party
 __all__ = ['Carrier']
 
 
-class Carrier(party.PartyCompanyMixin):
-    __metaclass__ = PoolMeta
+class Carrier(party.PartyCompanyMixin, metaclass=PoolMeta):
     __name__ = 'carrier'
diff --git a/employee.py b/employee.py
index 48d9f82..49a4162 100644
--- a/employee.py
+++ b/employee.py
@@ -5,8 +5,7 @@ from trytond.pyson import Eval, If
 
 __all__ = ['Employee']
 
-class Employee:
-    __metaclass__ = PoolMeta
+class Employee(metaclass=PoolMeta):
     __name__ = 'company.employee'
 
     @classmethod
diff --git a/party.py b/party.py
index c58c9df..d9f32f5 100644
--- a/party.py
+++ b/party.py
@@ -12,9 +12,8 @@ __all__ = ['PartyCompany', 'Party', 'Address', 'PartyIdentifier',
     'ContactMechanism']
 
 
-class Party:
+class Party(metaclass=PoolMeta):
     __name__ = 'party.party'
-    __metaclass__ = PoolMeta
     companies = fields.Function(fields.Many2Many('party.party-company.company',
         'party', 'company', 'Companies', domain=[
             ('id', 'in', Eval('context', {}).get('companies', [])),
@@ -231,18 +230,15 @@ class PartyCompanyMixin(object):
         return [('party.companies',) + tuple(clause[1:])]
 
 
-class Address(PartyCompanyMixin):
-    __metaclass__ = PoolMeta
+class Address(PartyCompanyMixin, metaclass=PoolMeta):
     __name__ = 'party.address'
 
 
-class PartyIdentifier(PartyCompanyMixin):
-    __metaclass__ = PoolMeta
+class PartyIdentifier(PartyCompanyMixin, metaclass=PoolMeta):
     __name__ = 'party.identifier'
 
 
-class ContactMechanism(PartyCompanyMixin):
-    __metaclass__ = PoolMeta
+class ContactMechanism(PartyCompanyMixin, metaclass=PoolMeta):
     __name__ = 'party.contact_mechanism'
 
 
diff --git a/setup.py b/setup.py
index 4ca3ce5..068a3a3 100644
--- a/setup.py
+++ b/setup.py
@@ -5,10 +5,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 = 'party_company'
 PREFIX = 'nantic'
diff --git a/tests/test_party_company.py b/tests/test_party_company.py
index 4abae3a..609b9aa 100644
--- a/tests/test_party_company.py
+++ b/tests/test_party_company.py
@@ -35,7 +35,7 @@ class PartyCompanyTestCase(ModuleTestCase):
         party1, = Party.create([{
                     'name': 'Party 1',
                     }])
-        self.assert_(party1.id)
+        self.assertTrue(party1.id)
         self.assertEqual(party1.companies, ())
 
     @with_transaction()
@@ -52,7 +52,7 @@ class PartyCompanyTestCase(ModuleTestCase):
             party.name = 'Party 2'
             party.companies = [company]
             party.save()
-            self.assert_(party.id)
+            self.assertTrue(party.id)
             self.assertEqual(len(party.companies), 1)
             address, = Address.create([{
                         'party': party.id,
diff --git a/user.py b/user.py
index 85c66cd..98fe6e9 100644
--- a/user.py
+++ b/user.py
@@ -12,8 +12,7 @@ from sql.functions import CurrentTimestamp
 __all__ = ['User', 'UserCompany']
 
 
-class User:
-    __metaclass__ = PoolMeta
+class User(metaclass=PoolMeta):
     __name__ = 'res.user'
     main_companies = fields.Many2Many('res.user-company.company', 'user',
         'company', 'Main Companies')
@@ -50,9 +49,9 @@ class User:
                 if company in company_childs:
                     company_ids = company_childs[company]
                 else:
-                    company_ids = map(int, Company.search([
+                    company_ids = list(map(int, Company.search([
                                 ('parent', 'child_of', [company.id]),
-                                ]))
+                                ])))
                     company_childs[company] = company_ids
                 if company_ids:
                     companies[user.id].extend(company_ids)