diff options
| author | xmo-odoo <xmo@odoo.com> | 2017-05-10 09:39:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-10 09:39:55 +0200 |
| commit | fffaf735f58f1ac57781c095eb552de6d1fcdc47 (patch) | |
| tree | 88ab0ab65430d871862a836524e0ecc890d1674d /addons/website_crm_partner_assign/controllers/main.py | |
| parent | 10eee18a047d35305dc46282e610e88936d81ffc (diff) | |
[FIX] P3: list -> iterable builtins (#16811)
In Python 3:
* various builtins and dict methods were changed to return
view/iterable objects rather than lists
* and the separate Python 2 view/iterable builtins and methods were
removed altogether
This is problematic when using these items as list (which the happens
repeatedly in Odoo), but more viciously when iterating *multiple times*
over them (which also happens, which I've messed up multiple times while
writing this, and which is a pain to debug even when you've just created
the issue).
Convert all code using these to semantics-matching cross-version
helper functions to get the LCD behaviour between P2 and P3, and
forbid the builtins via lint.
issue #8530
Diffstat (limited to 'addons/website_crm_partner_assign/controllers/main.py')
| -rw-r--r-- | addons/website_crm_partner_assign/controllers/main.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py index 5e69b2a2852..3c18c7cf470 100644 --- a/addons/website_crm_partner_assign/controllers/main.py +++ b/addons/website_crm_partner_assign/controllers/main.py @@ -12,6 +12,8 @@ from odoo import http from odoo.http import request from odoo.addons.website.models.website import slug, unslug from odoo.addons.website_partner.controllers.main import WebsitePartnerPage + +from odoo.tools import pycompat from odoo.tools.translate import _ from odoo.addons.website_portal.controllers.main import website_account @@ -149,7 +151,7 @@ class WebsiteAccount(website_account): 'pager': pager, 'searchbar_sortings': searchbar_sortings, 'sortby': sortby, - 'searchbar_filters': OrderedDict(sorted(searchbar_filters.items())), + 'searchbar_filters': OrderedDict(sorted(pycompat.items(searchbar_filters))), 'filterby': filterby, }) return request.render("website_crm_partner_assign.portal_my_opportunities", values) @@ -274,7 +276,7 @@ class WebsiteCrmPartnerAssign(WebsitePartnerPage): offset=pager['offset'], limit=self._references_per_page) partners = partner_ids.sudo() - google_map_partner_ids = ','.join(map(str, [p.id for p in partners])) + google_map_partner_ids = ','.join(str(p.id) for p in partners) google_maps_api_key = request.env['ir.config_parameter'].sudo().get_param('google_maps_api_key') values = { |