From 54df4b36d7c826de3d07f81297aa17f74d8271ea Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 10 May 2017 15:08:42 +0200 Subject: [PATCH] [FIX] P3: types.NoneType removed --- odoo/addons/test_pylint/tests/test_pylint.py | 1 - odoo/fields.py | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/odoo/addons/test_pylint/tests/test_pylint.py b/odoo/addons/test_pylint/tests/test_pylint.py index d7a6760854c..f518bb8d43e 100644 --- a/odoo/addons/test_pylint/tests/test_pylint.py +++ b/odoo/addons/test_pylint/tests/test_pylint.py @@ -73,7 +73,6 @@ class TestPyLint(TransactionCase): BAD_MODULES = [ 'commands', - 'types', ] def _skip_test(self, reason): diff --git a/odoo/fields.py b/odoo/fields.py index 9026789fee6..a4199916b8c 100644 --- a/odoo/fields.py +++ b/odoo/fields.py @@ -7,7 +7,6 @@ from collections import OrderedDict, defaultdict from datetime import date, datetime from functools import partial from operator import attrgetter -from types import NoneType import logging import pytz try: @@ -1396,7 +1395,7 @@ class Char(_String): def _setup_regular_base(self, model): super(Char, self)._setup_regular_base(model) - assert isinstance(self.size, (NoneType, int)), \ + assert self.size is None or isinstance(self.size, int), \ "Char field %s with non-integer size %r" % (self, self.size) def convert_to_column(self, value, record):