diff --git a/addons/membership/models/partner.py b/addons/membership/models/partner.py index 3078a39bc88..d8dd059a0b1 100644 --- a/addons/membership/models/partner.py +++ b/addons/membership/models/partner.py @@ -93,7 +93,7 @@ class Partner(models.Model): state = 'old' break - if partner.free_member and state is not 'paid': + if partner.free_member and state != 'paid': state = 'free' partner.membership_state = state diff --git a/odoo/addons/test_limits/models.py b/odoo/addons/test_limits/models.py index c443c9ed1c9..fe659c863fb 100644 --- a/odoo/addons/test_limits/models.py +++ b/odoo/addons/test_limits/models.py @@ -36,10 +36,10 @@ class m(models.Model): @api.model def consume_cpu_time(self, seconds): - t0 = time.clock() - t1 = time.clock() + t0 = time.process_time() + t1 = time.process_time() while t1 - t0 < seconds: for i in range(10000000): x = i * i - t1 = time.clock() + t1 = time.process_time() return True diff --git a/odoo/fields.py b/odoo/fields.py index be1a765afed..a18e1f9fea6 100644 --- a/odoo/fields.py +++ b/odoo/fields.py @@ -3576,9 +3576,9 @@ class Id(Field): # the code below is written to make record.id as quick as possible ids = record._ids size = len(ids) - if size is 0: + if size == 0: return False - elif size is 1: + elif size == 1: return ids[0] raise ValueError("Expected singleton: %s" % record)