%s
' % html
- root = lxml.html.fromstring(html)
+ html = u'%s
' % html
+ root = lxml.html.fromstring(html, encoding='unicode')
base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
base = urls.url_parse(base_url)
@@ -324,12 +324,12 @@ class MailTemplate(models.Model):
for node in root.iter():
if node.tag == 'a' and node.get('href'):
node.set('href', _process_link(node.get('href')))
- elif node.tag == 'img' and not node.get('src', 'data').startswith('data'):
+ elif node.tag == 'img' and not node.get('src', 'data').startswith(u'data'):
node.set('src', _process_link(node.get('src')))
- html = lxml.html.tostring(root, pretty_print=False, method='html')
+ html = lxml.html.tostring(root, pretty_print=False, method='html', encoding='unicode')
# this is ugly, but lxml/etree tostring want to put everything in a 'div' that breaks the editor -> remove that
- if html.startswith('') and html.endswith('
'):
+ if html.startswith(u'') and html.endswith(u'
'):
html = html[5:-6]
return html
@@ -379,7 +379,7 @@ class MailTemplate(models.Model):
'user': self.env.user,
'ctx': self._context, # context kw would clash with mako internals
}
- for res_id, record in pycompat.items(res_to_rec):
+ for res_id, record in res_to_rec.items():
variables['object'] = record
try:
render_result = template.render(variables)
@@ -391,7 +391,7 @@ class MailTemplate(models.Model):
results[res_id] = render_result
if post_process:
- for res_id, result in pycompat.items(results):
+ for res_id, result in results.items():
results[res_id] = self.render_post_process(result)
return multi_mode and results or results[res_ids[0]]
@@ -412,7 +412,7 @@ class MailTemplate(models.Model):
self.ensure_one()
langs = self.render_template(self.lang, self.model, res_ids)
- for res_id, lang in pycompat.items(langs):
+ for res_id, lang in langs.items():
if lang:
template = self.with_context(lang=lang)
else:
@@ -431,11 +431,11 @@ class MailTemplate(models.Model):
if self.use_default_to or self._context.get('tpl_force_default_to'):
default_recipients = self.env['mail.thread'].message_get_default_recipients(res_model=self.model, res_ids=res_ids)
- for res_id, recipients in pycompat.items(default_recipients):
+ for res_id, recipients in default_recipients.items():
results[res_id].pop('partner_to', None)
results[res_id].update(recipients)
- for res_id, values in pycompat.items(results):
+ for res_id, values in results.items():
partner_ids = values.get('partner_ids', list())
if self._context.get('tpl_partners_only'):
mails = tools.email_split(values.pop('email_to', '')) + tools.email_split(values.pop('email_cc', ''))
@@ -474,11 +474,11 @@ class MailTemplate(models.Model):
# templates: res_id -> template; template -> res_ids
templates_to_res_ids = {}
- for res_id, template in pycompat.items(res_ids_to_templates):
+ for res_id, template in res_ids_to_templates.items():
templates_to_res_ids.setdefault(template, []).append(res_id)
results = dict()
- for template, template_res_ids in pycompat.items(templates_to_res_ids):
+ for template, template_res_ids in templates_to_res_ids.items():
Template = self.env['mail.template']
# generate fields value for all res_ids linked to the current template
if template.lang:
@@ -488,7 +488,7 @@ class MailTemplate(models.Model):
generated_field_values = Template.render_template(
getattr(template, field), template.model, template_res_ids,
post_process=(field == 'body_html'))
- for res_id, field_value in pycompat.items(generated_field_values):
+ for res_id, field_value in generated_field_values.items():
results.setdefault(res_id, dict())[field] = field_value
# compute recipients
if any(field in fields for field in ['email_to', 'partner_to', 'email_cc']):
diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index 0d23032d051..296f79bed14 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -238,7 +238,7 @@ class MailThread(models.AbstractModel):
# auto_subscribe: take values and defaults into account
create_values = dict(values)
- for key, val in pycompat.items(self._context):
+ for key, val in self._context.items():
if key.startswith('default_') and key[8:] not in create_values:
create_values[key[8:]] = val
thread.message_auto_subscribe(list(create_values), values=create_values)
@@ -373,7 +373,7 @@ class MailThread(models.AbstractModel):
options['display_log_button'] = is_employee
# save options on the node
node.set('options', repr(options))
- res['arch'] = etree.tostring(doc)
+ res['arch'] = etree.tostring(doc, encoding='unicode')
return res
# ------------------------------------------------------
@@ -388,7 +388,7 @@ class MailThread(models.AbstractModel):
always tracked fields and modified on_change fields
"""
tracked_fields = []
- for name, field in pycompat.items(self._fields):
+ for name, field in self._fields.items():
if getattr(field, 'track_visibility', False):
tracked_fields.append(name)
@@ -416,13 +416,13 @@ class MailThread(models.AbstractModel):
@api.multi
def _message_track_post_template(self, tracking):
- if not any(change for rec_id, (change, tracking_value_ids) in pycompat.items(tracking)):
+ if not any(change for rec_id, (change, tracking_value_ids) in tracking.items()):
return True
templates = self._track_template(tracking)
- for field_name, (template, post_kwargs) in pycompat.items(templates):
+ for field_name, (template, post_kwargs) in templates.items():
if not template:
continue
- if isinstance(template, basestring):
+ if isinstance(template, pycompat.string_types):
self.message_post_with_view(template, **post_kwargs)
else:
self.message_post_with_template(template.id, **post_kwargs)
@@ -450,7 +450,7 @@ class MailThread(models.AbstractModel):
display_values_ids = []
# generate tracked_values data structure: {'col_name': {col_info, new_value, old_value}}
- for col_name, col_info in pycompat.items(tracked_fields):
+ for col_name, col_info in tracked_fields.items():
track_visibility = getattr(self._fields[col_name], 'track_visibility', 'onchange')
initial_value = initial[col_name]
new_value = getattr(self, col_name)
@@ -569,7 +569,7 @@ class MailThread(models.AbstractModel):
def _generate_notification_token(self, base_link, params):
secret = self.env['ir.config_parameter'].sudo().get_param('database.secret')
token = '%s?%s' % (base_link, ' '.join('%s=%s' % (key, params[key]) for key in sorted(params)))
- hm = hmac.new(str(secret), token, hashlib.sha1).hexdigest()
+ hm = hmac.new(secret.encode('utf-8'), token.encode('utf-8'), hashlib.sha1).hexdigest()
return hm
@api.multi
@@ -816,7 +816,7 @@ class MailThread(models.AbstractModel):
def message_capable_models(self):
""" Used by the plugin addon, based for plugin_outlook and others. """
ret_dict = {}
- for model_name, model in pycompat.items(self.env):
+ for model_name, model in self.env.items():
if hasattr(model, "message_process") and hasattr(model, "message_post"):
ret_dict[model_name] = model._description
return ret_dict
@@ -1266,12 +1266,16 @@ class MailThread(models.AbstractModel):
# we don't know its encoding until we parse its headers and hence can't
# convert it to utf-8 for transport between the mailgate script and here.
if isinstance(message, xmlrpclib.Binary):
- message = str(message.data)
- # Warning: message_from_string doesn't always work correctly on unicode,
- # we must use utf-8 strings here :-(
- if isinstance(message, unicode):
+ message = bytes(message.data)
+ # message_from_string parses from a *native string*, except apparently
+ # sometimes message is ISO-8859-1 binary data or some shit and the
+ # straightforward version (pycompat.to_native) won't work right ->
+ # always encode message to bytes then use the relevant method
+ # depending on ~python version
+ if isinstance(message, pycompat.text_type):
message = message.encode('utf-8')
- msg_txt = email.message_from_string(message)
+ extract = getattr(email, 'message_from_bytes', email.message_from_string)
+ msg_txt = extract(message)
# parse the message, verify we are not in a loop by checking message_id is not duplicated
msg = self.message_parse(msg_txt, save_original=save_original)
@@ -1492,9 +1496,9 @@ class MailThread(models.AbstractModel):
'message_type': 'email',
}
if not isinstance(message, Message):
- if isinstance(message, unicode):
- # Warning: message_from_string doesn't always work correctly on unicode,
- # we must use utf-8 strings here :-(
+ # message_from_string works on a native str, so on py2 we need to
+ # encode incoming unicode strings
+ if pycompat.PY2 and not isinstance(message, str):
message = message.encode('utf-8')
message = email.message_from_string(message)
@@ -1723,11 +1727,11 @@ class MailThread(models.AbstractModel):
cid = info and info.get('cid')
else:
continue
- if isinstance(content, unicode):
+ if isinstance(content, pycompat.text_type):
content = content.encode('utf-8')
data_attach = {
'name': name,
- 'datas': base64.b64encode(str(content)),
+ 'datas': base64.b64encode(content),
'type': 'binary',
'datas_fname': name,
'description': name,
@@ -1920,7 +1924,7 @@ class MailThread(models.AbstractModel):
values['slug'] = slug
except ImportError:
values['slug'] = lambda self: self.id
- if isinstance(views_or_xmlid, basestring):
+ if isinstance(views_or_xmlid, pycompat.string_types):
views = self.env.ref(views_or_xmlid, raise_if_not_found=False)
else:
views = views_or_xmlid
@@ -2052,7 +2056,7 @@ class MailThread(models.AbstractModel):
if auto_follow_fields is None:
auto_follow_fields = ['user_id']
user_field_lst = []
- for name, field in pycompat.items(self._fields):
+ for name, field in self._fields.items():
if name in auto_follow_fields and name in updated_fields and getattr(field, 'track_visibility', False) and field.comodel_name == 'res.users':
user_field_lst.append(name)
return user_field_lst
@@ -2148,10 +2152,10 @@ class MailThread(models.AbstractModel):
for partner in to_add_users.mapped('partner_id'):
new_partners.setdefault(partner.id, None)
- for pid, subtypes in pycompat.items(new_partners):
+ for pid, subtypes in new_partners.items():
subtypes = list(subtypes) if subtypes is not None else None
self.message_subscribe(partner_ids=[pid], subtype_ids=subtypes, force=(subtypes != None))
- for cid, subtypes in pycompat.items(new_channels):
+ for cid, subtypes in new_channels.items():
subtypes = list(subtypes) if subtypes is not None else None
self.message_subscribe(channel_ids=[cid], subtype_ids=subtypes, force=(subtypes != None))
diff --git a/addons/mail/models/res_partner.py b/addons/mail/models/res_partner.py
index 6379ddb8c42..9140959f89e 100644
--- a/addons/mail/models/res_partner.py
+++ b/addons/mail/models/res_partner.py
@@ -4,7 +4,6 @@
import logging
import threading
-from odoo.tools import pycompat
from odoo.tools.misc import split_every
from odoo import _, api, fields, models, registry, SUPERUSER_ID
@@ -175,7 +174,7 @@ class Partner(models.Model):
emails = self.env['mail.mail']
recipients_nbr, recipients_max = 0, 50
- for email_type, recipient_template_values in pycompat.items(recipients):
+ for email_type, recipient_template_values in recipients.items():
if recipient_template_values['followers']:
# generate notification email content
template_fol_values = dict(base_template_ctx, **recipient_template_values) # fixme: set button_unfollow to none
diff --git a/addons/mail/tests/test_mail_features.py b/addons/mail/tests/test_mail_features.py
index 92613f55e51..8e2264ad6d3 100644
--- a/addons/mail/tests/test_mail_features.py
+++ b/addons/mail/tests/test_mail_features.py
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
+import base64
from odoo.addons.mail.tests.common import TestMail
from odoo.addons.mail.tests.test_mail_gateway import MAIL_TEMPLATE_PLAINTEXT
@@ -89,8 +90,8 @@ class TestMessagePost(TestMail):
_body, _body_alt = 'Test Body
', 'Test Body' _subject = 'Test Subject' _attachments = [ - ('List1', 'My first attachment'), - ('List2', 'My second attachment') + ('List1', b'My first attachment'), + ('List2', b'My second attachment') ] _attach_1 = self.env['ir.attachment'].sudo(self.user_employee).create({ 'name': 'Attach1', 'datas_fname': 'Attach1', @@ -129,8 +130,8 @@ class TestMessagePost(TestMail): 'message_post: all atttachments should be linked to the mail.test model') self.assertEqual(set(msg.attachment_ids.mapped('res_id')), set([self.test_pigs.id]), 'message_post: all atttachments should be linked to the pigs group') - self.assertEqual(set([x.decode('base64') for x in msg.attachment_ids.mapped('datas')]), - set(['migration test', _attachments[0][1], _attachments[1][1]])) + self.assertEqual(set([base64.b64decode(x) for x in msg.attachment_ids.mapped('datas')]), + set([b'migration test', _attachments[0][1], _attachments[1][1]])) self.assertTrue(set([_attach_1.id, _attach_2.id]).issubset(msg.attachment_ids.ids), 'message_post: mail.message attachments duplicated') # notifications diff --git a/addons/mail/tests/test_mail_message.py b/addons/mail/tests/test_mail_message.py index db6dc9457a5..566a038d9ef 100644 --- a/addons/mail/tests/test_mail_message.py +++ b/addons/mail/tests/test_mail_message.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. - +import base64 import itertools from odoo.addons.mail.tests.common import TestMail @@ -215,7 +215,7 @@ class TestMailMessageAccess(TestMail): def test_mail_message_access_read_notification(self): attachment = self.env['ir.attachment'].create({ - 'datas': 'My attachment'.encode('base64'), + 'datas': base64.b64encode(b'My attachment'), 'name': 'doc.txt', 'datas_fname': 'doc.txt'}) # attach the attachment to the message diff --git a/addons/mail/tests/test_mail_template.py b/addons/mail/tests/test_mail_template.py index 60df04f0654..e5da1c628ae 100644 --- a/addons/mail/tests/test_mail_template.py +++ b/addons/mail/tests/test_mail_template.py @@ -17,13 +17,13 @@ class TestMailTemplate(TestMail): 'name': '_Test_First', 'datas_fname': 'first.txt', - 'datas': base64.b64encode('My first attachment'), + 'datas': base64.b64encode(b'My first attachment'), 'res_model': 'res.partner', 'res_id': self.user_admin.partner_id.id }, { 'name': '_Test_Second', 'datas_fname': 'second.txt', - 'datas': base64.b64encode('My second attachment'), + 'datas': base64.b64encode(b'My second attachment'), 'res_model': 'res.partner', 'res_id': self.user_admin.partner_id.id }] diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index 76412ce041c..767462df892 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -140,7 +140,7 @@ class MailComposer(models.TransientModel): for mid, rmod, rid in self._cr.fetchall(): message_values[mid] = {'model': rmod, 'res_id': rid} # remove from the set to check the ids that mail_compose_message accepts - author_ids = [mid for mid, message in pycompat.items(message_values) + author_ids = [mid for mid, message in message_values.items() if message.get('model') and not message.get('res_id')] self = self.browse(list(set(self.ids) - set(author_ids))) # not sure slef = ... @@ -248,7 +248,7 @@ class MailComposer(models.TransientModel): for res_ids in sliced_res_ids: batch_mails = Mail all_mail_values = wizard.get_mail_values(res_ids) - for res_id, mail_values in pycompat.items(all_mail_values): + for res_id, mail_values in all_mail_values.items(): if wizard.composition_mode == 'mass_mail': batch_mails |= Mail.create(mail_values) else: @@ -338,7 +338,7 @@ class MailComposer(models.TransientModel): def onchange_template_id_wrapper(self): self.ensure_one() values = self.onchange_template_id(self.template_id.id, self.composition_mode, self.model, self.res_id)['value'] - for fname, value in pycompat.items(values): + for fname, value in values.items(): setattr(self, fname, value) @api.multi diff --git a/addons/marketing_campaign/models/marketing_campaign.py b/addons/marketing_campaign/models/marketing_campaign.py index 7370633114e..6fea98870d8 100644 --- a/addons/marketing_campaign/models/marketing_campaign.py +++ b/addons/marketing_campaign/models/marketing_campaign.py @@ -9,7 +9,6 @@ import re from odoo import api, fields, models, _ from odoo.exceptions import UserError, ValidationError -from odoo.tools import pycompat from odoo.tools.safe_eval import safe_eval from odoo.addons import decimal_precision as dp @@ -466,7 +465,7 @@ class MarketingCampaignWorkitem(models.Model): matching_workitems = [] for id, res_id, model in res: workitem_map.setdefault(model, {}).setdefault(res_id, set()).add(id) - for model, id_map in pycompat.items(workitem_map): + for model, id_map in workitem_map.items(): Model = self.env[model] condition_name[0] = Model._rec_name condition = [('id', 'in', list(id_map)), condition_name] diff --git a/addons/mass_mailing/controllers/main.py b/addons/mass_mailing/controllers/main.py index 276056311b8..b2e77c2875e 100644 --- a/addons/mass_mailing/controllers/main.py +++ b/addons/mass_mailing/controllers/main.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. +import base64 import werkzeug @@ -37,7 +38,7 @@ class MassMailController(http.Controller): request.env['mail.mail.statistics'].sudo().set_opened(mail_mail_ids=[mail_id]) response = werkzeug.wrappers.Response() response.mimetype = 'image/gif' - response.data = 'R0lGODlhAQABAIAAANvf7wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=='.decode('base64') + response.data = base64.b64decode(b'R0lGODlhAQABAIAAANvf7wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==') return response diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py index 44993bdc907..a10e6143c89 100644 --- a/addons/mass_mailing/models/mass_mailing.py +++ b/addons/mass_mailing/models/mass_mailing.py @@ -430,7 +430,7 @@ class MassMailing(models.Model): secret = self.env["ir.config_parameter"].sudo().get_param( "database.secret") token = (self.env.cr.dbname, self.id, int(res_id), tools.ustr(email)) - return hmac.new(str(secret), repr(token), hashlib.sha512).hexdigest() + return hmac.new(secret.encode('utf-8'), repr(token).encode('utf-8'), hashlib.sha512).hexdigest() def _compute_next_departure(self): cron_next_call = self.env.ref('mass_mailing.ir_cron_mass_mailing_queue').sudo().nextcall diff --git a/addons/membership/models/account_invoice.py b/addons/membership/models/account_invoice.py index 273dd4290ba..73622ce0fb2 100644 --- a/addons/membership/models/account_invoice.py +++ b/addons/membership/models/account_invoice.py @@ -60,9 +60,9 @@ class AccountInvoiceLine(models.Model): invoice_line.product_id.membership and \ not MemberLine.search([('account_invoice_line', '=', invoice_line.id)]): # Product line is a membership product - date_from = invoice_line.product_id.membership_date_from - date_to = invoice_line.product_id.membership_date_to - if invoice_line.invoice_id.date_invoice > date_from and invoice_line.invoice_id.date_invoice < date_to: + date_from = invoice_line.product_id.membership_date_from or '0000-00-00' + date_to = invoice_line.product_id.membership_date_to or '0000-00-00' + if date_from < (invoice_line.invoice_id.date_invoice or '0000-00-00') < date_to: date_from = invoice_line.invoice_id.date_invoice MemberLine.create({ 'partner': invoice_line.invoice_id.partner_id.id, diff --git a/addons/mrp/models/mrp_workcenter.py b/addons/mrp/models/mrp_workcenter.py index 58226b2e9e8..cc12ec0060b 100644 --- a/addons/mrp/models/mrp_workcenter.py +++ b/addons/mrp/models/mrp_workcenter.py @@ -5,7 +5,6 @@ from dateutil import relativedelta import datetime from odoo import api, exceptions, fields, models, _ -from odoo.tools import pycompat class MrpWorkcenter(models.Model): @@ -74,7 +73,7 @@ class MrpWorkcenter(models.Model): if res_group['state'] in ('pending', 'ready', 'progress'): result_duration_expected[res_group['workcenter_id'][0]] += res_group['duration_expected'] for workcenter in self: - workcenter.workorder_count = sum(count for state, count in pycompat.items(result[workcenter.id]) if state not in ('done', 'cancel')) + workcenter.workorder_count = sum(count for state, count in result[workcenter.id].items() if state not in ('done', 'cancel')) workcenter.workorder_pending_count = result[workcenter.id].get('pending', 0) workcenter.workcenter_load = result_duration_expected[workcenter.id] workcenter.workorder_ready_count = result[workcenter.id].get('ready', 0) diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice.py b/addons/mrp_repair/wizard/mrp_repair_make_invoice.py index a659e45e962..03e89da5cd5 100644 --- a/addons/mrp_repair/wizard/mrp_repair_make_invoice.py +++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice.py @@ -2,7 +2,6 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from odoo import api, fields, models -from odoo.tools import pycompat class MakeInvoice(models.TransientModel): @@ -25,7 +24,7 @@ class MakeInvoice(models.TransientModel): # but that second call will not do anything, since the repairs are already invoiced. repairs.action_repair_invoice_create() return { - 'domain': [('id', 'in', list(pycompat.values(new_invoice)))], + 'domain': [('id', 'in', list(new_invoice.values()))], 'name': 'Invoices', 'view_type': 'form', 'view_mode': 'tree,form', diff --git a/addons/pad/models/pad.py b/addons/pad/models/pad.py index 945e24f4308..d0c2055c739 100644 --- a/addons/pad/models/pad.py +++ b/addons/pad/models/pad.py @@ -10,7 +10,7 @@ import requests from odoo import api, models, _ from odoo.exceptions import UserError -from odoo.tools import html2plaintext, pycompat +from odoo.tools import html2plaintext from ..py_etherpad import EtherpadLiteClient @@ -106,7 +106,7 @@ class PadCommon(models.AbstractModel): # In case the pad is created programmatically, the content is not filled in yet since it is # normally initialized by the JS layer - for k, field in pycompat.items(self._fields): + for k, field in self._fields.items(): if hasattr(field, 'pad_content_field') and k not in vals: ctx = { 'model': self._name, @@ -121,7 +121,7 @@ class PadCommon(models.AbstractModel): def _set_pad_value(self, vals): # Update the pad if the `pad_content_field` is modified - for k, field in pycompat.items(self._fields): + for k, field in self._fields.items(): if hasattr(field, 'pad_content_field') and vals.get(field.pad_content_field) and self[k]: company = self.env.user.sudo().company_id myPad = EtherpadLiteClient(company.pad_key, company.pad_server + '/api') @@ -129,7 +129,7 @@ class PadCommon(models.AbstractModel): myPad.setText(path, (html2plaintext(vals[field.pad_content_field]).encode('utf-8'))) # Update the `pad_content_field` if the pad is modified - for k, v in list(pycompat.items(vals)): + for k, v in vals.items(): field = self._fields[k] if hasattr(field, 'pad_content_field'): vals[field.pad_content_field] = self.pad_get_content(v) @@ -139,7 +139,7 @@ class PadCommon(models.AbstractModel): self.ensure_one() if not default: default = {} - for k, field in pycompat.items(self._fields): + for k, field in self._fields.items(): if hasattr(field, 'pad_content_field'): pad = self.pad_generate_url() default[k] = pad.get('url') diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py index 623676c7a9c..2e36d891344 100644 --- a/addons/payment/models/payment_acquirer.py +++ b/addons/payment/models/payment_acquirer.py @@ -5,7 +5,7 @@ import logging import datetime from odoo import api, exceptions, fields, models, _ -from odoo.tools import consteq, float_round, image_resize_images, ustr, pycompat +from odoo.tools import consteq, float_round, image_resize_images, ustr from odoo.addons.base.module import module from odoo.exceptions import ValidationError @@ -169,7 +169,7 @@ class PaymentAcquirer(models.Model): """ If the field has 'required_if_provider="
-
+
', 1), ('website_published', '=', True)], limit=step, offset=pager['offset'], order='karma DESC')
# put the users in block of 3 to display them as a table
- users = [[] for i in range(len(user_obj) / 3 + 1)]
+ users = [[] for i in range(len(user_obj) // 3 + 1)]
for index, user in enumerate(user_obj):
- users[index / 3].append(user)
+ users[index // 3].append(user)
searches['users'] = 'True'
values = self._prepare_forum_values(forum=forum, searches=searches)
@@ -578,7 +577,7 @@ class WebsiteForum(http.Controller):
img_path = modules.get_module_resource('web', 'static/src/img', 'placeholder.png')
with open(img_path, 'rb') as f:
image = f.read()
- content = image.encode('base64')
+ content = base64.b64encode(image)
if status == 304:
return werkzeug.wrappers.Response(status=304)
image_base64 = base64.b64decode(content)
@@ -712,7 +711,7 @@ class WebsiteForum(http.Controller):
values['image'] = False
elif kwargs.get('ufile'):
image = kwargs.get('ufile').read()
- values['image'] = image.encode('base64')
+ values['image'] = base64.b64encode(image)
if request.uid == user.id: # the controller allows to edit only its own privacy settings; use partner management for other cases
values['website_published'] = kwargs.get('website_published') == 'True'
diff --git a/addons/website_forum/models/res_users.py b/addons/website_forum/models/res_users.py
index 9d22ee3c9d8..054e3a4d56a 100644
--- a/addons/website_forum/models/res_users.py
+++ b/addons/website_forum/models/res_users.py
@@ -66,11 +66,12 @@ class Users(models.Model):
and is a hash based on a (secret) uuid generated by the forum module,
the user_id, the email and currently the day (to be updated if necessary). """
forum_uuid = self.env['ir.config_parameter'].sudo().get_param('website_forum.uuid')
- return hashlib.sha256('%s-%s-%s-%s' % (
+ return hashlib.sha256((u'%s-%s-%s-%s' % (
datetime.now().replace(hour=0, minute=0, second=0, microsecond=0),
forum_uuid,
user_id,
- email)).hexdigest()
+ email
+ )).encode('utf-8')).hexdigest()
@api.one
def send_forum_validation_email(self, forum_id=None):
diff --git a/addons/website_livechat/controllers/main.py b/addons/website_livechat/controllers/main.py
index 675b56e561f..753e4eef1ae 100644
--- a/addons/website_livechat/controllers/main.py
+++ b/addons/website_livechat/controllers/main.py
@@ -3,7 +3,6 @@
from odoo import http
from odoo.http import request
-from odoo.tools import pycompat
class WebsiteLivechat(http.Controller):
@@ -27,7 +26,7 @@ class WebsiteLivechat(http.Controller):
# compute percentage
percentage = dict.fromkeys(['great', 'okay', 'bad'], 0)
for grade in repartition:
- percentage[grade] = repartition[grade] * 100 / sum(pycompat.values(repartition)) if sum(pycompat.values(repartition)) else 0
+ percentage[grade] = repartition[grade] * 100 / sum(repartition.values()) if sum(repartition.values()) else 0
# the value dict to render the template
values = {
diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index c10525fd5e0..ab42fb5c3b5 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
from werkzeug.exceptions import NotFound, Forbidden
from odoo import http
diff --git a/addons/website_mail_channel/models/mail_channel.py b/addons/website_mail_channel/models/mail_channel.py
index 519dfe7afc6..79c6cc27287 100644
--- a/addons/website_mail_channel/models/mail_channel.py
+++ b/addons/website_mail_channel/models/mail_channel.py
@@ -68,4 +68,4 @@ class MailGroup(models.Model):
str(self.id),
str(partner_id),
action])
- return hmac.new(secret.encode('utf-8'), data).hexdigest()
+ return hmac.new(secret.encode('utf-8'), data.encode('utf-8')).hexdigest()
diff --git a/addons/website_portal/controllers/main.py b/addons/website_portal/controllers/main.py
index 3b2fbfc2a2d..865312cc7c6 100644
--- a/addons/website_portal/controllers/main.py
+++ b/addons/website_portal/controllers/main.py
@@ -4,7 +4,6 @@
from odoo import http
from odoo.http import request
from odoo import tools
-from odoo.tools import pycompat
from odoo.tools.translate import _
from odoo.exceptions import ValidationError
@@ -134,7 +133,7 @@ class website_account(http.Controller):
error["vat"] = 'error'
# error message for empty required fields
- if [err for err in pycompat.values(error) if err == 'missing']:
+ if [err for err in error.values() if err == 'missing']:
error_message.append(_('Some required fields are empty.'))
unknown = [k for k in data if k not in self.MANDATORY_BILLING_FIELDS + self.OPTIONAL_BILLING_FIELDS]
diff --git a/addons/website_portal_purchase/controllers/website_portal.py b/addons/website_portal_purchase/controllers/website_portal.py
index 874c311f92a..4d8762e4346 100644
--- a/addons/website_portal_purchase/controllers/website_portal.py
+++ b/addons/website_portal_purchase/controllers/website_portal.py
@@ -6,7 +6,6 @@ from collections import OrderedDict
from odoo import http
from odoo.exceptions import AccessError
from odoo.http import request
-from odoo.tools import pycompat
from odoo.tools.translate import _
from odoo.addons.website_portal.controllers.main import website_account, get_records_pager
@@ -89,7 +88,7 @@ class WebsitePortal(website_account):
'archive_groups': archive_groups,
'searchbar_sortings': searchbar_sortings,
'sortby': sortby,
- 'searchbar_filters': OrderedDict(sorted(pycompat.items(searchbar_filters))),
+ 'searchbar_filters': OrderedDict(sorted(searchbar_filters.items())),
'filterby': filterby,
'default_url': '/my/purchase',
})
diff --git a/addons/website_project/controllers/main.py b/addons/website_project/controllers/main.py
index d8716efd9ac..720c4f65700 100644
--- a/addons/website_project/controllers/main.py
+++ b/addons/website_project/controllers/main.py
@@ -8,7 +8,6 @@ from odoo.http import request
from odoo.addons.website_portal.controllers.main import website_account, get_records_pager
from odoo.osv.expression import OR
-from odoo.tools import pycompat
class WebsiteAccount(website_account):
@@ -156,7 +155,7 @@ class WebsiteAccount(website_account):
'searchbar_inputs': searchbar_inputs,
'search_in': search_in,
'sortby': sortby,
- 'searchbar_filters': OrderedDict(sorted(pycompat.items(searchbar_filters))),
+ 'searchbar_filters': OrderedDict(sorted(searchbar_filters.items())),
'filterby': filterby,
})
return request.render("website_project.my_tasks", values)
diff --git a/addons/website_project_issue/controllers/main.py b/addons/website_project_issue/controllers/main.py
index 1ce21cff8e8..940544a2188 100644
--- a/addons/website_project_issue/controllers/main.py
+++ b/addons/website_project_issue/controllers/main.py
@@ -105,7 +105,7 @@ class WebsiteAccount(website_account):
'searchbar_sortings': searchbar_sortings,
'searchbar_inputs': searchbar_inputs,
'sortby': sortby,
- 'searchbar_filters': OrderedDict(sorted(pycompat.items(searchbar_filters))),
+ 'searchbar_filters': OrderedDict(sorted(searchbar_filters.items())),
'filterby': filterby,
'search_in': search_in,
'search': search,
diff --git a/addons/website_quote/controllers/main.py b/addons/website_quote/controllers/main.py
index 8e4359ecbec..c9dff4745ad 100644
--- a/addons/website_quote/controllers/main.py
+++ b/addons/website_quote/controllers/main.py
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
+import base64
import werkzeug
@@ -91,7 +92,7 @@ class sale_quote(http.Controller):
return request.render('website.404')
if Order.state != 'sent':
return False
- attachments = [('signature.png', sign.decode('base64'))] if sign else []
+ attachments = [('signature.png', base64.b64decode(sign))] if sign else []
Order.action_confirm()
message = _('Order signed by %s') % (signer,)
_message_post_helper(message=message, res_id=order_id, res_model='sale.order', attachments=attachments, **({'token': token, 'token_field': 'access_token'} if token else {}))
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 8f02d4a0117..40057484efe 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -12,8 +12,6 @@ from odoo.addons.website.controllers.main import QueryURL
from odoo.exceptions import ValidationError
from odoo.addons.website_form.controllers.main import WebsiteForm
-from odoo.tools import pycompat
-
_logger = logging.getLogger(__name__)
PPG = 20 # Products Per Page
@@ -53,35 +51,35 @@ class TableCompute(object):
x = y = 1
pos = minpos
- while not self._check_place(pos % PPR, pos / PPR, x, y):
+ while not self._check_place(pos % PPR, pos // PPR, x, y):
pos += 1
# if 21st products (index 20) and the last line is full (PPR products in it), break
# (pos + 1.0) / PPR is the line where the product would be inserted
# maxy is the number of existing lines
# + 1.0 is because pos begins at 0, thus pos 20 is actually the 21st block
# and to force python to not round the division operation
- if index >= ppg and ((pos + 1.0) / PPR) > maxy:
+ if index >= ppg and ((pos + 1.0) // PPR) > maxy:
break
if x == 1 and y == 1: # simple heuristic for CPU optimization
- minpos = pos / PPR
+ minpos = pos // PPR
for y2 in range(y):
for x2 in range(x):
- self.table[(pos / PPR) + y2][(pos % PPR) + x2] = False
- self.table[pos / PPR][pos % PPR] = {
+ self.table[(pos // PPR) + y2][(pos % PPR) + x2] = False
+ self.table[pos // PPR][pos % PPR] = {
'product': p, 'x': x, 'y': y,
'class': " ".join(x.html_class for x in p.website_style_ids if x.html_class)
}
if index <= ppg:
- maxy = max(maxy, y + (pos / PPR))
+ maxy = max(maxy, y + (pos // PPR))
index += 1
# Format table according to HTML needs
- rows = sorted(pycompat.items(self.table))
+ rows = sorted(self.table.items())
rows = [r[1] for r in rows]
for col in range(len(rows)):
- cols = sorted(pycompat.items(rows[col]))
+ cols = sorted(rows[col].items())
x += len(cols)
rows[col] = [r[1] for r in cols if r[1]]
@@ -373,7 +371,7 @@ class WebsiteSale(http.Controller):
return request.redirect("/shop/cart")
def _filter_attributes(self, **kw):
- return {k: v for k, v in pycompat.items(kw) if "attribute" in k}
+ return {k: v for k, v in kw.items() if "attribute" in k}
@http.route(['/shop/cart/update_json'], type='json', auth="public", methods=['POST'], website=True, csrf=False)
def cart_update_json(self, product_id, line_id=None, add_qty=None, set_qty=None, display=True):
@@ -491,7 +489,7 @@ class WebsiteSale(http.Controller):
except ValidationError:
error["vat"] = 'error'
- if [err for err in pycompat.items(error) if err == 'missing']:
+ if [err for err in error.items() if err == 'missing']:
error_message.append(_('Some required fields are empty.'))
return error, error_message
@@ -517,7 +515,7 @@ class WebsiteSale(http.Controller):
def values_postprocess(self, order, mode, values, errors, error_msg):
new_values = {}
authorized_fields = request.env['ir.model']._get('res.partner')._get_form_writable_fields()
- for k, v in pycompat.items(values):
+ for k, v in values.items():
# don't drop empty value, it could be a field to reset
if k in authorized_fields and v is not None:
new_values[k] = v
@@ -680,7 +678,7 @@ class WebsiteSale(http.Controller):
# if form posted
if 'post_values' in post:
values = {}
- for field_name, field_value in pycompat.items(post):
+ for field_name, field_value in post.items():
if field_name in request.env['sale.order']._fields and field_name.startswith('x_'):
values[field_name] = field_value
if values:
@@ -910,7 +908,7 @@ class WebsiteSale(http.Controller):
@http.route(['/shop/get_unit_price'], type='json', auth="public", methods=['POST'], website=True)
def get_unit_price(self, product_ids, add_qty, **kw):
products = request.env['product.product'].with_context({'quantity': add_qty}).browse(product_ids)
- return {product.id: product.website_price / add_qty for product in products}
+ return {product.id: product.website_price // add_qty for product in products}
# ------------------------------------------------------
# Edit
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index cffff7f2f3d..724d24b5c03 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -6,7 +6,6 @@ import random
from odoo import api, models, fields, _
from odoo.http import request
from odoo.exceptions import UserError, ValidationError
-from odoo.tools import pycompat
_logger = logging.getLogger(__name__)
@@ -93,7 +92,7 @@ class SaleOrder(models.Model):
# add untracked attributes in the name
untracked_attributes = []
- for k, v in pycompat.items(attributes):
+ for k, v in attributes.items():
# attribute should be like 'attribute-48-1' where 48 is the product_id, 1 is the attribute_id and v is the attribute value
attribute_value = self.env['product.attribute.value'].sudo().browse(int(v))
if attribute_value and not attribute_value.attribute_id.create_variant:
diff --git a/addons/website_sale/tests/test_website_sale_pricelist.py b/addons/website_sale/tests/test_website_sale_pricelist.py
index cf97fd815cc..21accb52814 100644
--- a/addons/website_sale/tests/test_website_sale_pricelist.py
+++ b/addons/website_sale/tests/test_website_sale_pricelist.py
@@ -2,7 +2,6 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from mock import patch
from odoo.tests.common import TransactionCase
-from odoo.tools import pycompat
class TestWebsitePriceList(TransactionCase):
@@ -61,7 +60,7 @@ class TestWebsitePriceList(TransactionCase):
'CA': ['Canada'],
'US': ['USD', 'EUR', 'Benelux', 'Canada']
}
- for country, result in pycompat.items(country_list):
+ for country, result in country_list.items():
pls = self.get_pl(show, current_pl, country)
self.assertEquals(len(set(pls.mapped('name')) & set(result)), len(pls), 'Test failed for %s (%s %s vs %s %s)'
% (country, len(pls), pls.mapped('name'), len(result), result))
@@ -78,7 +77,7 @@ class TestWebsitePriceList(TransactionCase):
'CA': ['Canada']
}
- for country, result in pycompat.items(country_list):
+ for country, result in country_list.items():
pls = self.get_pl(show, current_pl, country)
self.assertEquals(len(set(pls.mapped('name')) & set(result)), len(pls), 'Test failed for %s (%s %s vs %s %s)'
% (country, len(pls), pls.mapped('name'), len(result), result))
@@ -99,7 +98,7 @@ class TestWebsitePriceList(TransactionCase):
'CA': False
}
- for country, result in pycompat.items(country_list):
+ for country, result in country_list.items():
self.args['country'] = country
# mock patch method could not pass env context
available = self.website.is_pricelist_available(christmas_pl)
@@ -120,7 +119,7 @@ class TestWebsitePriceList(TransactionCase):
'CA': ['EUR', 'Canada'],
'US': ['USD', 'EUR', 'Benelux', 'Canada']
}
- for country, result in pycompat.items(country_list):
+ for country, result in country_list.items():
pls = self.get_pl(show, current_pl, country)
self.assertEquals(len(set(pls.mapped('name')) & set(result)), len(pls), 'Test failed for %s (%s %s vs %s %s)'
% (country, len(pls), pls.mapped('name'), len(result), result))
diff --git a/addons/website_sale_digital/controllers/main.py b/addons/website_sale_digital/controllers/main.py
index ec0aeec82a7..67e125ee341 100644
--- a/addons/website_sale_digital/controllers/main.py
+++ b/addons/website_sale_digital/controllers/main.py
@@ -2,7 +2,7 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
import base64
-from cStringIO import StringIO
+import io
from werkzeug.utils import redirect
from odoo import http
@@ -99,7 +99,7 @@ class WebsiteSaleDigital(website_account):
else:
return request.not_found()
elif attachment["datas"]:
- data = StringIO(base64.standard_b64decode(attachment["datas"]))
+ data = io.BytesIO(base64.standard_b64decode(attachment["datas"]))
return http.send_file(data, filename=attachment['name'], as_attachment=True)
else:
return request.not_found()
diff --git a/addons/website_sale_options/controllers/main.py b/addons/website_sale_options/controllers/main.py
index 8349f0e08bc..af48c17f2e1 100644
--- a/addons/website_sale_options/controllers/main.py
+++ b/addons/website_sale_options/controllers/main.py
@@ -5,8 +5,6 @@ from odoo import http
from odoo.http import request
from odoo.addons.website_sale.controllers.main import WebsiteSale
-from odoo.tools import pycompat
-
class WebsiteSaleOptions(WebsiteSale):
@@ -26,7 +24,7 @@ class WebsiteSaleOptions(WebsiteSale):
option_ids = product.optional_product_ids.mapped('product_variant_ids').ids
optional_product_ids = []
- for k, v in pycompat.items(kw):
+ for k, v in kw.items():
if "optional-product-" in k and int(kw.get(k.replace("product", "add"))) and int(v) in option_ids:
optional_product_ids.append(int(v))
diff --git a/addons/website_slides/controllers/main.py b/addons/website_slides/controllers/main.py
index 0b7fdb47982..7bf77624fe6 100644
--- a/addons/website_slides/controllers/main.py
+++ b/addons/website_slides/controllers/main.py
@@ -164,7 +164,7 @@ class WebsiteSlides(http.Controller):
@http.route('''/slides/slide//pdf_content''', type='http', auth="public", website=True)
def slide_get_pdf_content(self, slide):
response = werkzeug.wrappers.Response()
- response.data = slide.datas and slide.datas.decode('base64') or ''
+ response.data = slide.datas and base64.b64decode(slide.datas) or b''
response.mimetype = 'application/pdf'
return response
diff --git a/addons/website_slides/models/slides.py b/addons/website_slides/models/slides.py
index ee65b15734b..ad5df26cadd 100644
--- a/addons/website_slides/models/slides.py
+++ b/addons/website_slides/models/slides.py
@@ -3,6 +3,7 @@
import requests
from PIL import Image
+import base64
import datetime
import io
import json
@@ -11,7 +12,7 @@ import re
from werkzeug import urls
from odoo import api, fields, models, SUPERUSER_ID, _
-from odoo.tools import image, pycompat
+from odoo.tools import image
from odoo.tools.translate import html_translate
from odoo.exceptions import Warning
from odoo.addons.website.models.website import slug
@@ -322,8 +323,8 @@ class Slide(models.Model):
values = res['values']
if not values.get('document_id'):
raise Warning(_('Please enter valid Youtube or Google Doc URL'))
- for key, value in pycompat.items(values):
- setattr(self, key, value)
+ for key, value in values.items():
+ self[key] = value
# website
date_published = fields.Datetime('Publish Date')
@@ -384,7 +385,7 @@ class Slide(models.Model):
values['date_published'] = datetime.datetime.now()
if values.get('url') and not values.get('document_id'):
doc_data = self._parse_document_url(values['url']).get('values', dict())
- for key, value in pycompat.items(doc_data):
+ for key, value in doc_data.items():
values.setdefault(key, value)
# Do not publish slide if user has not publisher rights
if not self.user_has_groups('website.group_website_publisher'):
@@ -398,7 +399,7 @@ class Slide(models.Model):
def write(self, values):
if values.get('url') and values['url'] != self.url:
doc_data = self._parse_document_url(values['url']).get('values', dict())
- for key, value in pycompat.items(doc_data):
+ for key, value in doc_data.items():
values.setdefault(key, value)
if values.get('channel_id'):
custom_channels = self.env['slide.channel'].search([('custom_slide_id', '=', self.id), ('id', '!=', values.get('channel_id'))])
@@ -498,13 +499,12 @@ class Slide(models.Model):
try:
response = requests.get(base_url, params=data)
response.raise_for_status()
- content = response.content
if content_type == 'json':
- result['values'] = json.loads(content)
+ result['values'] = response.json()
elif content_type in ('image', 'pdf'):
- result['values'] = content.encode('base64')
+ result['values'] = base64.b64encode(response.content)
else:
- result['values'] = content
+ result['values'] = response.content
except requests.exceptions.HTTPError as e:
result['error'] = e.response.content
except requests.exceptions.ConnectionError as e:
@@ -565,7 +565,7 @@ class Slide(models.Model):
# TDE FIXME: WTF ??
slide_type = 'presentation'
if vals.get('image'):
- image = Image.open(io.BytesIO(vals['image'].decode('base64')))
+ image = Image.open(io.BytesIO(base64.b64decode(vals['image'])))
width, height = image.size
if height > width:
return 'document'
diff --git a/doc/_extensions/github_link.py b/doc/_extensions/github_link.py
index d3e5d61c28e..155e4083025 100644
--- a/doc/_extensions/github_link.py
+++ b/doc/_extensions/github_link.py
@@ -4,6 +4,8 @@ import os.path
from werkzeug import urls
+from odoo.tools import pycompat
+
"""
* adds github_link(mode) context variable: provides URL (in relevant mode) of
current document on github
@@ -99,7 +101,7 @@ def add_doc_link(app, pagename, templatename, context, doctree):
# in Sphinx 1.3 it's possible to have mutliple source suffixes and that
# may be useful in the future
source_suffix = app.config.source_suffix
- source_suffix = source_suffix if isinstance(source_suffix, basestring) else source_suffix[0]
+ source_suffix = source_suffix if isinstance(source_suffix, pycompat.string_types) else source_suffix[0]
# can't use functools.partial because 3rd positional is line not mode
context['github_link'] = lambda mode='edit': make_github_link(
app, 'doc/%s%s' % (pagename, source_suffix), mode=mode)
diff --git a/doc/_extensions/odoo_ext/translator.py b/doc/_extensions/odoo_ext/translator.py
index 3a1928364eb..443458f33c7 100644
--- a/doc/_extensions/odoo_ext/translator.py
+++ b/doc/_extensions/odoo_ext/translator.py
@@ -11,6 +11,8 @@ from docutils import nodes
from sphinx import addnodes, util
from sphinx.locale import admonitionlabels
+from odoo.tools import pycompat
+
def _parents(node):
while node.parent:
@@ -62,7 +64,7 @@ class BootstrapTranslator(nodes.NodeVisitor, object):
self.param_separator = ','
def encode(self, text):
- return unicode(text).translate({
+ return pycompat.text_type(text).translate({
ord('&'): u'&',
ord('<'): u'<',
ord('"'): u'"',
@@ -71,7 +73,7 @@ class BootstrapTranslator(nodes.NodeVisitor, object):
})
def starttag(self, node, tagname, **attributes):
- tagname = unicode(tagname).lower()
+ tagname = pycompat.text_type(tagname).lower()
# extract generic attributes
attrs = {name.lower(): value for name, value in attributes.items()}
@@ -105,8 +107,8 @@ class BootstrapTranslator(nodes.NodeVisitor, object):
)
# only "space characters" SPACE, CHARACTER TABULATION, LINE FEED,
# FORM FEED and CARRIAGE RETURN should be collapsed, not al White_Space
- def attval(self, value, whitespace=re.compile(u'[ \t\n\f\r]')):
- return self.encode(whitespace.sub(u' ', unicode(value)))
+ def attval(self, value, whitespace=re.compile(u'[ \t\n\f\r]+')):
+ return self.encode(whitespace.sub(u' ', pycompat.text_type(value)))
def astext(self):
return u''.join(self.body)
diff --git a/doc/python3.rst b/doc/python3.rst
index 3773d77c4e7..c8e8269936e 100644
--- a/doc/python3.rst
+++ b/doc/python3.rst
@@ -61,6 +61,11 @@ features whereas:
generator delegation, pathlib, ...), you must *not* use them in Odoo
until Python 2 support is dropped
+.. note::
+
+ In the *very rare* cases where you *need* to differentiate between
+ Python 2 and Python 3, use the :data:`odoo.tools.pycompat.PY2` flag.
+
Semantics changes
=================
@@ -228,10 +233,7 @@ methods or functions having been *removed entirely*:
.. important::
When possible, use comprehensions (list, generator, ...) rather than
- ``map`` or ``filter``, otherwise use the cross-version ``pycompat``
- versions (``pycompat.imap``, ``pycompat.ifilter`` and
- ``pycompat.izip``). The ``pycompat`` versions all return *iterators* and
- may need to be wrapped in a ``list()`` call to yield a list.
+ ``map`` or ``filter``.
* In Python 3, ``dict.keys``, ``dict.values`` and ``dict.items`` return
*views* rather than lists, and the ``iter*`` and ``view*`` methods have
@@ -239,11 +241,9 @@ methods or functions having been *removed entirely*:
.. important::
- Prefer using :func:`odoo.tools.pycompat.keys`,
- :func:`odoo.tools.pycompat.values` and :func:`odoo.tools.pycompat.items`
- return cross-version iterators. When needing actual lists (e.g. to
- modify a dictionary during iteration), wrap one of the calls above in a
- ``list()``.
+ When the result of the above methods is used for more than a one-shot
+ loop (e.g. to be included in returned value), or when the dict needs
+ to be modified during iteration, wrap the calls in a ``list()``.
builtins
--------
@@ -369,8 +369,121 @@ Minor syntax changes
error, octal literals now follow the hexadecimal convention with a ``0o``
prefix.
+.. _changed-strings:
+
+Bytes/String/Text: The Big One
+==============================
+
+The most impactful Python 3 change by far is to the text model: for historical
+reasons the distinction Python 2's bytestrings (``bytes``/``str``) and text
+strings (``unicode``) is fuzzy and it will try to implicitly convert between
+one and the other using the ASCII encoding.
+
+Python 3 changes this, it removes the implicit conversions, removes APIs which
+contribute to the fuzz and tends to strictly segregate other to work on either
+bytes or text.
+
+This is fundamentally good and mostly sensible, but it means lots of breakage:
+
+the builtins
+------------
+
+Python 3 removes both ``unicode`` and ``basestring``, and ``str`` now
+corresponds to *text* strings (the old ``unicode``) with ``bytes`` being
+bytestrings in both languages [#bytes]_.
+
+Both versions have the following prefixes for string literals:
+
+* ``b'foo'`` is a bytestring (``bytes`` object).
+
+* ``'foo'`` is that version's ``str`` type, which may be either a bytestring
+ or a text string [#native-string]_.
+
+* ``u'foo'`` is that version's text string.
+
+For best cross-version compatibility you should avoid unprefixed string
+literals unless you *specifically* need a "native string" [#native-string]_.
+
+For easier type-testing, :mod:`odoo.tools.pycompat` provides the following
+constants:
+
+* :data:`~odoo.tools.pycompat.string_types` is an alias/type tuple for testing
+ string types, essentially a replacement of testing for ``basestring`` or
+ ``(str, unicode)``.
+* :data:`~odoo.tools.pycompat.text_type` is the proper *text* type for the
+ current version, it should mostly be used for converting non-bytes objects
+ to text.
+* ``bytes`` should be avoided for type conversions, though it can be used to
+ check if an object is a bytestring.
+
+``open``
+--------
+
+.. important::
+
+ the ``open`` builtin should always be explicitly used in binary mode
+ (``rb``, ``wb``, ...)
+
+ To read *text* files, use ``io.open``.
+
+On both P2 and P3, ``open`` defaults to returning *native strings* in default
+("text") mode, however in P3 that means it actually decodes the file's bytes
+using whatever encoding was set up (default: UTF-8) while on Python 2 it has
+no concept of encoding.
+
+Using ``open`` in binary mode provides bytestrings on both versions and works
+fine. To read *text* files, use ``io.open`` and provide an explicit encoding.
+
+base64
+------
+
+base64 is a bytes->bytes conversion. bytes->bytes codecs were removed from the
+"native" encoding/decoding system which is now exclusively for bytes<->text
+conversions: text is *encoded* to bytes and bytes are *decoded* to text.
+
+.. important::
+
+ both ``bytes.encode('base64')`` and ``bytes.decode('base64')`` must be
+ migrated to using ``base64.b64encode`` and ``base64.b64decode``
+ respectively.
+
+csv
+---
+
+``csv`` is a fairly vicious one: not only is it not a very good format, the
+Python 2 and Python 3 versions of the library are text-model incompatible in
+significant ways:
+
+* Python 2's CSV only works on *ascii-compatible byte streams* (it has no
+ encoding support at all) and extracts bytestring values
+* Python 3's CSV only works on *text streams* and extract text values
+* And ``io`` doesn't provide "native string" streaming facilities.
+
+However with respect to Odoo it turns out most or all uses of ``csv`` fit
+inside a model of *byte stream to and from text values*.
+
+The latter is thus a model implemented by cross-version wrappers
+:func:`odoo.tools.pycompat.csv_reader` and
+:func:`odoo.tools.pycompat.csv_writer`: they take a *UTF-8 byte stream* and
+read or write *text* values.
+
.. _hash randomisation: http://bugs.python.org/issue13703
.. _requests: http://docs.python-requests.org/
.. _werkzeug: http://werkzeug.pocoo.org/docs/urls/
+
+.. [#bytes]
+
+ with the caveat that Python 3 makes them less text-y and more byte-y e.g.
+ in Python 2 ``b"foo"[0]`` is ``b"f"``, but in Python 3 it's ``102`` (the
+ value of the first byte), you'll want to *slice* bytestrings for
+ compatibility.
+
+.. [#native-string]
+
+ this is important because some API/contexts take a *native string* rather
+ than either bytes or text. The ``csv`` module of the standard library is
+ one such problematic API (it is also notoriously problematic for its
+ terrible support of non-ascii-compatible encodings in Python 2).
+ ``email.message_from_string`` is an other one.
diff --git a/doc/reference/guidelines.rst b/doc/reference/guidelines.rst
index 058fe7ffb1c..fc15c10f7ab 100644
--- a/doc/reference/guidelines.rst
+++ b/doc/reference/guidelines.rst
@@ -452,12 +452,9 @@ So, you can write ``if some_collection:`` instead of ``if len(some_collection):`
# better
for key in my_dict:
"do something..."
- # creates a temporary list
+ # accessing the key,value pair
for key, value in my_dict.items():
"do something..."
- # only iterates
- for key, value in my_dict.iteritems():
- "do something..."
- Use dict.setdefault
diff --git a/odoo/addons/base/ir/ir_actions_report.py b/odoo/addons/base/ir/ir_actions_report.py
index 27cfafe1326..3f81bd13e95 100644
--- a/odoo/addons/base/ir/ir_actions_report.py
+++ b/odoo/addons/base/ir/ir_actions_report.py
@@ -10,6 +10,7 @@ from odoo.http import request
import time
import base64
+import io
import logging
import os
import lxml.html
@@ -56,9 +57,9 @@ except (OSError, IOError):
else:
_logger.info('Will use the Wkhtmltopdf binary at %s' % _get_wkhtmltopdf_bin())
out, err = process.communicate()
- match = re.search('([0-9.]+)', out)
+ match = re.search(b'([0-9.]+)', out)
if match:
- version = match.group(0)
+ version = match.group(0).decode('ascii')
if LooseVersion(version) < LooseVersion('0.12.0'):
_logger.info('Upgrade Wkhtmltopdf to (at least) 0.12.0')
wkhtmltopdf_state = 'upgrade'
@@ -464,20 +465,20 @@ class IrActionsReport(models.Model):
if wkhtmltopdf_obj.header:
head_file_fd, head_file_path = tempfile.mkstemp(suffix='.html', prefix='report.header.tmp.')
temporary_files.append(head_file_path)
- with closing(os.fdopen(head_file_fd, 'w')) as head_file:
+ with closing(os.fdopen(head_file_fd, 'wb')) as head_file:
head_file.write(wkhtmltopdf_obj.header)
local_command_args.extend(['--header-html', head_file_path])
if wkhtmltopdf_obj.footer:
foot_file_fd, foot_file_path = tempfile.mkstemp(suffix='.html', prefix='report.footer.tmp.')
temporary_files.append(foot_file_path)
- with closing(os.fdopen(foot_file_fd, 'w')) as foot_file:
+ with closing(os.fdopen(foot_file_fd, 'wb')) as foot_file:
foot_file.write(wkhtmltopdf_obj.footer)
local_command_args.extend(['--footer-html', foot_file_path])
# Body stuff
content_file_fd, content_file_path = tempfile.mkstemp(suffix='.html', prefix='report.body.tmp.')
temporary_files.append(content_file_path)
- with closing(os.fdopen(content_file_fd, 'w')) as content_file:
+ with closing(os.fdopen(content_file_fd, 'wb')) as content_file:
content_file.write(wkhtmltopdf_obj.content)
try:
diff --git a/odoo/addons/base/ir/ir_attachment.py b/odoo/addons/base/ir/ir_attachment.py
index 9d19d076438..41b85913ed9 100644
--- a/odoo/addons/base/ir/ir_attachment.py
+++ b/odoo/addons/base/ir/ir_attachment.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
+import base64
import hashlib
import itertools
import logging
@@ -11,7 +11,7 @@ from collections import defaultdict
from odoo import api, fields, models, tools, SUPERUSER_ID, _
from odoo.exceptions import AccessError
-from odoo.tools import config, human_size, ustr, html_escape, pycompat
+from odoo.tools import config, human_size, ustr, html_escape
from odoo.tools.mimetypes import guess_mimetype
_logger = logging.getLogger(__name__)
@@ -97,14 +97,14 @@ class IrAttachment(models.Model):
if bin_size:
r = human_size(os.path.getsize(full_path))
else:
- r = open(full_path,'rb').read().encode('base64')
+ r = base64.b64encode(open(full_path,'rb').read())
except (IOError, OSError):
_logger.info("_read_file reading %s", full_path, exc_info=True)
return r
@api.model
def _file_write(self, value, checksum):
- bin_value = value.decode('base64')
+ bin_value = base64.b64decode(value)
fname, full_path = self._get_path(bin_value, checksum)
if not os.path.exists(full_path):
try:
@@ -167,7 +167,7 @@ class IrAttachment(models.Model):
# remove garbage files, and clean up checklist
removed = 0
- for fname, filepath in pycompat.items(checklist):
+ for fname, filepath in checklist.items():
if fname not in whitelist:
try:
os.unlink(self._full_path(fname))
@@ -195,7 +195,7 @@ class IrAttachment(models.Model):
for attach in self:
# compute the fields that depend on datas
value = attach.datas
- bin_data = value and value.decode('base64') or ''
+ bin_data = base64.b64decode(value) if value else b''
vals = {
'file_size': len(bin_data),
'checksum': self._compute_checksum(bin_data),
@@ -220,7 +220,7 @@ class IrAttachment(models.Model):
:param bin_data : datas in its binary form
"""
# an empty file has a checksum too (for caching)
- return hashlib.sha1(bin_data or '').hexdigest()
+ return hashlib.sha1(bin_data or b'').hexdigest()
def _compute_mimetype(self, values):
""" compute the mimetype of the given values
@@ -235,7 +235,7 @@ class IrAttachment(models.Model):
if not mimetype and values.get('url'):
mimetype = mimetypes.guess_type(values['url'])[0]
if values.get('datas') and (not mimetype or mimetype == 'application/octet-stream'):
- mimetype = guess_mimetype(values['datas'].decode('base64'))
+ mimetype = guess_mimetype(base64.b64decode(values['datas']))
return mimetype or 'application/octet-stream'
def _check_contents(self, values):
@@ -258,8 +258,8 @@ class IrAttachment(models.Model):
if file_type:
index_content = file_type.split('/')[0]
if index_content == 'text': # compute index_content only for text type
- words = re.findall("[^\x00-\x1F\x7F-\xFF]{4,}", bin_data)
- index_content = ustr("\n".join(words))
+ words = re.findall(b"[\x20-\x7E]{4,}", bin_data)
+ index_content = b"\n".join(words).decode('ascii')
return index_content
name = fields.Char('Attachment Name', required=True)
@@ -318,7 +318,7 @@ class IrAttachment(models.Model):
model_ids[values['res_model']].add(values['res_id'])
# check access rights on the records
- for res_model, res_ids in pycompat.items(model_ids):
+ for res_model, res_ids in model_ids.items():
# ignore attachments that are not attached to a resource anymore
# when checking access rights (resource was deleted but attachment
# was not)
@@ -374,12 +374,12 @@ class IrAttachment(models.Model):
# To avoid multiple queries for each attachment found, checks are
# performed in batch as much as possible.
- for res_model, targets in pycompat.items(model_attachments):
+ for res_model, targets in model_attachments.items():
if res_model not in self.env:
continue
if not self.env[res_model].check_access_rights('read', False):
# remove all corresponding attachment ids
- ids.difference_update(itertools.chain(*pycompat.values(targets)))
+ ids.difference_update(itertools.chain(*targets.values()))
continue
# filter ids according to what access rules permit
target_ids = list(targets)
diff --git a/odoo/addons/base/ir/ir_config_parameter.py b/odoo/addons/base/ir/ir_config_parameter.py
index 8e4ea20b5a5..a286a8836ce 100644
--- a/odoo/addons/base/ir/ir_config_parameter.py
+++ b/odoo/addons/base/ir/ir_config_parameter.py
@@ -16,8 +16,8 @@ _logger = logging.getLogger(__name__)
A dictionary holding some configuration parameters to be initialized when the database is created.
"""
_default_parameters = {
- "database.secret": lambda: str(uuid.uuid4()),
- "database.uuid": lambda: str(uuid.uuid1()),
+ "database.secret": lambda: pycompat.text_type(uuid.uuid4()),
+ "database.uuid": lambda: pycompat.text_type(uuid.uuid1()),
"database.create_date": fields.Datetime.now,
"web.base.url": lambda: "http://localhost:%s" % config.get('xmlrpc_port'),
}
@@ -42,7 +42,7 @@ class IrConfigParameter(models.Model):
Initializes the parameters listed in _default_parameters.
It overrides existing parameters if force is ``True``.
"""
- for key, func in pycompat.items(_default_parameters):
+ for key, func in _default_parameters.items():
# force=True skips search and always performs the 'if' body (because ids=False)
params = self.sudo().search([('key', '=', key)])
if force or not params:
diff --git a/odoo/addons/base/ir/ir_fields.py b/odoo/addons/base/ir/ir_fields.py
index 204d4599425..d7521ed6ba1 100644
--- a/odoo/addons/base/ir/ir_fields.py
+++ b/odoo/addons/base/ir/ir_fields.py
@@ -12,9 +12,9 @@ from odoo.tools import ustr, pycompat
REFERENCING_FIELDS = {None, 'id', '.id'}
def only_ref_fields(record):
- return {k: v for k, v in pycompat.items(record) if k in REFERENCING_FIELDS}
+ return {k: v for k, v in record.items() if k in REFERENCING_FIELDS}
def exclude_ref_fields(record):
- return {k: v for k, v in pycompat.items(record) if k not in REFERENCING_FIELDS}
+ return {k: v for k, v in record.items() if k not in REFERENCING_FIELDS}
CREATE = lambda values: (0, False, values)
UPDATE = lambda id, values: (1, id, values)
@@ -38,12 +38,12 @@ class IrFieldsConverter(models.AbstractModel):
@api.model
def _format_import_error(self, error_type, error_msg, error_params=(), error_args=None):
# sanitize error params for later formatting by the import system
- sanitize = lambda p: p.replace('%', '%%') if isinstance(p, basestring) else p
+ sanitize = lambda p: p.replace('%', '%%') if isinstance(p, pycompat.string_types) else p
if error_params:
- if isinstance(error_params, basestring):
+ if isinstance(error_params, pycompat.string_types):
error_params = sanitize(error_params)
elif isinstance(error_params, dict):
- error_params = {k: sanitize(v) for k, v in pycompat.items(error_params)}
+ error_params = {k: sanitize(v) for k, v in error_params.items()}
elif isinstance(error_params, tuple):
error_params = tuple(sanitize(v) for v in error_params)
return error_type(error_msg % error_params, error_args)
@@ -64,12 +64,12 @@ class IrFieldsConverter(models.AbstractModel):
converters = {
name: self.to_field(model, field, fromtype)
- for name, field in pycompat.items(model._fields)
+ for name, field in model._fields.items()
}
def fn(record, log):
converted = {}
- for field, value in pycompat.items(record):
+ for field, value in record.items():
if field in REFERENCING_FIELDS:
continue
if not value:
@@ -78,7 +78,7 @@ class IrFieldsConverter(models.AbstractModel):
try:
converted[field], ws = converters[field](value)
for w in ws:
- if isinstance(w, basestring):
+ if isinstance(w, pycompat.string_types):
# wrap warning string in an ImportWarning for
# uniform handling
w = ImportWarning(w)
@@ -269,14 +269,14 @@ class IrFieldsConverter(models.AbstractModel):
for item, label in selection:
label = ustr(label)
labels = [label] + self._get_translations(('selection', 'model', 'code'), label)
- if value == unicode(item) or value in labels:
+ if value == pycompat.text_type(item) or value in labels:
return item, []
raise self._format_import_error(
ValueError,
_(u"Value '%s' not found in selection field '%%(field)s'"),
value,
- {'moreinfo': [_label or unicode(item) for item, _label in selection if _label or item]}
+ {'moreinfo': [_label or pycompat.text_type(item) for item, _label in selection if _label or item]}
)
@api.model
diff --git a/odoo/addons/base/ir/ir_http.py b/odoo/addons/base/ir/ir_http.py
index ff4654cf6c9..af9fde0b012 100644
--- a/odoo/addons/base/ir/ir_http.py
+++ b/odoo/addons/base/ir/ir_http.py
@@ -125,7 +125,7 @@ class IrHttp(models.AbstractModel):
attach = env['ir.attachment'].search_read(domain, fields)
if attach:
wdate = attach[0]['__last_update']
- datas = attach[0]['datas'] or ''
+ datas = attach[0]['datas'] or b''
name = attach[0]['name']
checksum = attach[0]['checksum'] or hashlib.sha1(datas).hexdigest()
@@ -148,7 +148,7 @@ class IrHttp(models.AbstractModel):
return response
response.mimetype = attach[0]['mimetype'] or 'application/octet-stream'
- response.data = datas.decode('base64')
+ response.data = base64.b64decode(datas)
return response
@classmethod
@@ -203,7 +203,7 @@ class IrHttp(models.AbstractModel):
@classmethod
def _postprocess_args(cls, arguments, rule):
""" post process arg to set uid on browse records """
- for name, arg in list(pycompat.items(arguments)):
+ for name, arg in list(arguments.items()):
if isinstance(arg, models.BaseModel) and arg._uid is UID_PLACEHOLDER:
arguments[name] = arg.sudo(request.uid)
if not arg.exists():
@@ -288,7 +288,7 @@ class IrHttp(models.AbstractModel):
if module_resource_path.startswith(module_path):
with open(module_resource_path, 'rb') as f:
content = base64.b64encode(f.read())
- last_update = str(os.path.getmtime(module_resource_path))
+ last_update = pycompat.text_type(os.path.getmtime(module_resource_path))
if not module_resource_path:
module_resource_path = obj.url
@@ -323,8 +323,8 @@ class IrHttp(models.AbstractModel):
headers += [('Content-Type', mimetype), ('X-Content-Type-Options', 'nosniff')]
# cache
- etag = hasattr(request, 'httprequest') and request.httprequest.headers.get('If-None-Match')
- retag = '"%s"' % hashlib.md5(last_update).hexdigest()
+ etag = bool(request) and request.httprequest.headers.get('If-None-Match')
+ retag = '"%s"' % hashlib.md5(last_update.encode('utf-8')).hexdigest()
status = status or (304 if etag == retag else 200)
headers.append(('ETag', retag))
headers.append(('Cache-Control', 'max-age=%s' % (STATIC_CACHE if unique else 0)))
diff --git a/odoo/addons/base/ir/ir_mail_server.py b/odoo/addons/base/ir/ir_mail_server.py
index 91cf0e61e73..0ecb895e082 100644
--- a/odoo/addons/base/ir/ir_mail_server.py
+++ b/odoo/addons/base/ir/ir_mail_server.py
@@ -39,20 +39,8 @@ class WriteToLogger(object):
_logger.debug(s)
smtplib.stderr = WriteToLogger()
-def try_coerce_ascii(string_utf8):
- """Attempts to decode the given utf8-encoded string
- as ASCII after coercing it to UTF-8, then return
- the confirmed 7-bit ASCII string.
-
- If the process fails (because the string
- contains non-ASCII characters) returns ``None``.
- """
- try:
- string_utf8.decode('ascii')
- except UnicodeDecodeError:
- return
- return string_utf8
-
+def is_ascii(s):
+ return all(ord(cp) < 128 for cp in s)
def encode_header(header_text):
"""Returns an appropriate representation of the given header value,
@@ -70,16 +58,10 @@ def encode_header(header_text):
"""
if not header_text:
return ""
- # convert anything to utf-8, suitable for testing ASCIIness, as 7-bit chars are
- # encoded as ASCII in utf-8
- header_text_utf8 = ustr(header_text).encode('utf-8')
- header_text_ascii = try_coerce_ascii(header_text_utf8)
- # if this header contains non-ASCII characters,
- # we'll need to wrap it up in a message.header.Header
- # that will take care of RFC2047-encoding it as
- # 7-bit string.
- return header_text_ascii or Header(header_text_utf8, 'utf-8')
-
+ header_text = ustr(header_text) # FIXME: require unicode higher up?
+ if is_ascii(header_text):
+ return pycompat.to_native(header_text)
+ Header(header_text, 'utf-8')
def encode_header_param(param_text):
"""Returns an appropriate RFC2047 encoded representation of the given
@@ -97,10 +79,10 @@ def encode_header_param(param_text):
# For details see the encode_header() method that uses the same logic
if not param_text:
return ""
- param_text_utf8 = ustr(param_text).encode('utf-8')
- param_text_ascii = try_coerce_ascii(param_text_utf8)
- return param_text_ascii or Charset('utf8').header_encode(param_text_utf8)
-
+ param_text = ustr(param_text) # FIXME: require unicode higher up?
+ if is_ascii(param_text):
+ return pycompat.to_native(param_text) # TODO: is that actually necessary?
+ return Charset("utf-8").header_encode(param_text)
address_pattern = re.compile(r'([^ ,<@]+@[^> ,]+)')
@@ -111,8 +93,8 @@ def extract_rfc2822_addresses(text):
"""
if not text:
return []
- candidates = address_pattern.findall(ustr(text).encode('utf-8'))
- return [c for c in candidates if try_coerce_ascii(c)]
+ candidates = address_pattern.findall(ustr(text))
+ return [c for c in candidates if is_ascii(c)]
def encode_rfc2822_address_header(header_text):
@@ -124,11 +106,20 @@ def encode_rfc2822_address_header(header_text):
"""
def encode_addr(addr):
name, email = addr
- if not try_coerce_ascii(name):
- name = str(Header(name, 'utf-8'))
+ # If s is a , then charset is a hint specifying the
+ # character set of the characters in the string. The Unicode string
+ # will be encoded using the following charsets in order: us-ascii,
+ # the charset hint, utf-8. The first character set to not provoke a
+ # UnicodeError is used.
+ # -> always pass a text string to Header
+
+ # also Header.__str__ in Python 3 "Returns an approximation of the
+ # Header as a string, using an unlimited line length.", the old one
+ # was "A synonym for Header.encode()." so call encode() directly?
+ name = Header(pycompat.to_text(name)).encode()
return formataddr((name, email))
- addresses = getaddresses([ustr(header_text).encode('utf-8')])
+ addresses = getaddresses([pycompat.to_native(ustr(header_text))])
return COMMASPACE.join(encode_addr(a) for a in addresses)
@@ -252,8 +243,8 @@ class IrMailServer(models.Model):
# The user/password must be converted to bytestrings in order to be usable for
# certain hashing schemes, like HMAC.
# See also bug #597143 and python issue #5285
- smtp_user = ustr(smtp_user).encode('utf-8')
- smtp_password = ustr(smtp_password).encode('utf-8')
+ smtp_user = pycompat.to_native(ustr(smtp_user))
+ smtp_password = pycompat.to_native(ustr(smtp_password))
connection.login(smtp_user, smtp_password)
return connection
@@ -301,8 +292,8 @@ class IrMailServer(models.Model):
email_bcc = email_bcc or []
body = body or u''
- email_body_utf8 = ustr(body).encode('utf-8')
- email_text_part = MIMEText(email_body_utf8, _subtype=subtype, _charset='utf-8')
+ email_body = ustr(body)
+ email_text_part = MIMEText(email_body, _subtype=subtype, _charset='utf-8')
msg = MIMEMultipart()
if not message_id:
@@ -327,21 +318,21 @@ class IrMailServer(models.Model):
msg['Bcc'] = encode_rfc2822_address_header(COMMASPACE.join(email_bcc))
msg['Date'] = formatdate()
# Custom headers may override normal headers or provide additional ones
- for key, value in pycompat.items(headers):
- msg[ustr(key).encode('utf-8')] = encode_header(value)
+ for key, value in headers.items():
+ msg[pycompat.to_native(ustr(key))] = encode_header(value)
if subtype == 'html' and not body_alternative:
# Always provide alternative text body ourselves if possible.
- text_utf8 = html2text.html2text(email_body_utf8.decode('utf-8')).encode('utf-8')
+ text = html2text.html2text(email_body_utf8)
alternative_part = MIMEMultipart(_subtype="alternative")
- alternative_part.attach(MIMEText(text_utf8, _charset='utf-8', _subtype='plain'))
+ alternative_part.attach(MIMEText(text, _charset='utf-8', _subtype='plain'))
alternative_part.attach(email_text_part)
msg.attach(alternative_part)
elif body_alternative:
# Include both alternatives, as specified, within a multipart/alternative part
alternative_part = MIMEMultipart(_subtype="alternative")
- body_alternative_utf8 = ustr(body_alternative).encode('utf-8')
- alternative_body_part = MIMEText(body_alternative_utf8, _subtype=subtype_alternative, _charset='utf-8')
+ body_alternative_ = ustr(body_alternative)
+ alternative_body_part = MIMEText(body_alternative_, _subtype=subtype_alternative, _charset='utf-8')
alternative_part.attach(alternative_body_part)
alternative_part.attach(email_text_part)
msg.attach(alternative_part)
diff --git a/odoo/addons/base/ir/ir_model.py b/odoo/addons/base/ir/ir_model.py
index 4fa66406108..25967c6b212 100644
--- a/odoo/addons/base/ir/ir_model.py
+++ b/odoo/addons/base/ir/ir_model.py
@@ -18,11 +18,6 @@ _logger = logging.getLogger(__name__)
MODULE_UNINSTALL_FLAG = '_force_unlink'
-def encode(s):
- """ Return an UTF8-encoded version of ``s``. """
- return s.encode('utf8') if isinstance(s, unicode) else s
-
-
# base environment for doing a safe_eval
SAFE_EVAL_BASE = {
'datetime': datetime,
@@ -199,7 +194,7 @@ class IrModel(models.Model):
@api.multi
def write(self, vals):
if '__last_update' in self._context:
- self = self.with_context({k: v for k, v in pycompat.items(self._context) if k != '__last_update'})
+ self = self.with_context({k: v for k, v in self._context.items() if k != '__last_update'})
if 'model' in vals and any(rec.model != vals['model'] for rec in self):
raise UserError(_('Field "Model" cannot be modified on models.'))
if 'state' in vals and any(rec.state != vals['state'] for rec in self):
@@ -272,7 +267,7 @@ class IrModel(models.Model):
def _instanciate(self, model_data):
""" Return a class for the custom model given by parameters ``model_data``. """
class CustomModel(models.Model):
- _name = encode(model_data['model'])
+ _name = pycompat.to_native(model_data['model'])
_description = model_data['name']
_module = False
_custom = True
@@ -771,7 +766,7 @@ class IrModelFields(models.Model):
fields_data[field.name] = dict(params, id=record.id)
return record
- diff = {key for key, val in pycompat.items(params) if field_data[key] != val}
+ diff = {key for key, val in params.items() if field_data[key] != val}
if diff:
cr = self.env.cr
# update the entry in this table
@@ -789,7 +784,7 @@ class IrModelFields(models.Model):
def _reflect_model(self, model):
""" Reflect the given model's fields. """
self.clear_caches()
- for field in pycompat.values(model._fields):
+ for field in model._fields.values():
self._reflect_field(field)
if not self.pool._init:
@@ -872,7 +867,7 @@ class IrModelFields(models.Model):
def _add_manual_fields(self, model):
""" Add extra fields on model. """
fields_data = self._get_manual_field_data(model._name)
- for name, field_data in pycompat.items(fields_data):
+ for name, field_data in fields_data.items():
if name not in model._fields and field_data['state'] == 'manual':
field = self._instanciate(field_data)
if field:
@@ -1134,7 +1129,7 @@ class IrModelAccess(models.Model):
# User root have all accesses
return True
- assert isinstance(model, basestring), 'Not a model name: %s' % (model,)
+ assert isinstance(model, pycompat.string_types), 'Not a model name: %s' % (model,)
assert mode in ('read', 'write', 'create', 'unlink'), 'Invalid access mode'
# TransientModel records have no access rights, only an implicit access rule
@@ -1283,7 +1278,7 @@ class IrModelData(models.Model):
model_id_name[xid.model][xid.res_id] = None
# fill in model_id_name with name_get() of corresponding records
- for model, id_name in pycompat.items(model_id_name):
+ for model, id_name in model_id_name.items():
try:
ng = self.env[model].browse(id_name).name_get()
id_name.update(ng)
@@ -1380,7 +1375,7 @@ class IrModelData(models.Model):
record = self.get_object(module, xml_id)
if record:
self.loads[(module, xml_id)] = (model, record.id)
- for parent_model, parent_field in pycompat.items(self.env[model]._inherits):
+ for parent_model, parent_field in self.env[model]._inherits.items():
parent = record[parent_field]
parent_xid = '%s_%s' % (xml_id, parent_model.replace('.', '_'))
self.loads[(module, parent_xid)] = (parent_model, parent.id)
@@ -1435,7 +1430,7 @@ class IrModelData(models.Model):
elif record:
record.write(values)
if xml_id:
- for parent_model, parent_field in pycompat.items(record._inherits):
+ for parent_model, parent_field in record._inherits.items():
self.sudo().create({
'name': xml_id + '_' + parent_model.replace('.', '_'),
'model': parent_model,
@@ -1454,7 +1449,7 @@ class IrModelData(models.Model):
elif mode == 'init' or (mode == 'update' and xml_id):
existing_parents = set() # {parent_model, ...}
if xml_id:
- for parent_model, parent_field in pycompat.items(record._inherits):
+ for parent_model, parent_field in record._inherits.items():
xid = self.sudo().search([
('module', '=', module),
('name', '=', xml_id + '_' + parent_model.replace('.', '_')),
@@ -1474,7 +1469,7 @@ class IrModelData(models.Model):
inherit_models = [record]
while inherit_models:
current_model = inherit_models.pop()
- for parent_model_name, parent_field in pycompat.items(current_model._inherits):
+ for parent_model_name, parent_field in current_model._inherits.items():
inherit_models.append(self.env[parent_model_name])
if parent_model_name in existing_parents:
continue
@@ -1500,7 +1495,7 @@ class IrModelData(models.Model):
if xml_id and record:
self.loads[(module, xml_id)] = (model, record.id)
- for parent_model, parent_field in pycompat.items(record._inherits):
+ for parent_model, parent_field in record._inherits.items():
parent_xml_id = xml_id + '_' + parent_model.replace('.', '_')
self.loads[(module, parent_xml_id)] = (parent_model, record[parent_field].id)
diff --git a/odoo/addons/base/ir/ir_qweb/__init__.py b/odoo/addons/base/ir/ir_qweb/__init__.py
index b7fb78857b1..b0add281fdb 100644
--- a/odoo/addons/base/ir/ir_qweb/__init__.py
+++ b/odoo/addons/base/ir/ir_qweb/__init__.py
@@ -5,5 +5,5 @@ from . import fields
from . import assetsbundle
from .assetsbundle import AssetsBundle
-from .qweb import unicodifier, QWebException
+from .qweb import QWebException
from .ir_qweb import IrQWeb, QWeb
diff --git a/odoo/addons/base/ir/ir_qweb/assetsbundle.py b/odoo/addons/base/ir/ir_qweb/assetsbundle.py
index ac7c04fba38..fbf0d42f8b5 100644
--- a/odoo/addons/base/ir/ir_qweb/assetsbundle.py
+++ b/odoo/addons/base/ir/ir_qweb/assetsbundle.py
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
+import base64
import os
import re
import hashlib
@@ -12,7 +13,7 @@ from odoo import fields, tools
from odoo.http import request
from odoo.modules.module import get_resource_path
import psycopg2
-from odoo.tools import func, misc, pycompat
+from odoo.tools import func, misc
import logging
_logger = logging.getLogger(__name__)
@@ -101,7 +102,7 @@ class AssetsBundle(object):
def to_html(self, sep=None, css=True, js=True, debug=False, async=False, url_for=(lambda url: url)):
if sep is None:
- sep = '\n '
+ sep = u'\n '
response = []
if debug == 'assets':
if css and self.stylesheets:
@@ -120,12 +121,12 @@ class AssetsBundle(object):
if css and self.stylesheets:
css_attachments = self.css() or []
for attachment in css_attachments:
- response.append('' % url_for(attachment.url))
+ response.append(u'' % url_for(attachment.url))
if self.css_errors:
msg = '\n'.join(self.css_errors)
response.append(JavascriptAsset(self, inline=self.dialog_message(msg)).to_html())
if js and self.javascripts:
- response.append('' % (async and 'async="async"' or '', url_for(self.js().url)))
+ response.append(u'' % (async and u'async="async"' or '', url_for(self.js().url)))
response.extend(self.remains)
return sep + sep.join(response)
@@ -148,8 +149,8 @@ class AssetsBundle(object):
Not really a full checksum.
We compute a SHA1 on the rendered bundle + max linked files last_modified date
"""
- check = json.dumps(self.files) + ",".join(self.remains) + str(self.last_modified)
- return hashlib.sha1(check).hexdigest()
+ check = u"%s%s%s" % (json.dumps(self.files), u",".join(self.remains), self.last_modified)
+ return hashlib.sha1(check.encode('utf-8')).hexdigest()
def clean_attachments(self, type):
""" Takes care of deleting any outdated ir.attachment records associated to a bundle before
@@ -207,7 +208,7 @@ class AssetsBundle(object):
'res_id': False,
'type': 'binary',
'public': True,
- 'datas': content.encode('utf8').encode('base64'),
+ 'datas': base64.b64encode(content.encode('utf8')),
}
attachment = ira.sudo().create(values)
@@ -315,11 +316,11 @@ class AssetsBundle(object):
outdated = True
break
if asset._content is None:
- asset._content = attachment.datas and attachment.datas.decode('base64').decode('utf8') or ''
+ asset._content = attachment.datas and base64.b64decode(attachment.datas).decode('utf8') or ''
if not asset._content and attachment.file_size > 0:
asset._content = None # file missing, force recompile
- if any(asset._content is None for asset in pycompat.values(assets)):
+ if any(asset._content is None for asset in assets.values()):
outdated = True
if outdated:
@@ -357,7 +358,7 @@ class AssetsBundle(object):
url = asset.html_url
with self.env.cr.savepoint():
self.env['ir.attachment'].sudo().create(dict(
- datas=asset.content.encode('utf8').encode('base64'),
+ datas=base64.b64encode(asset.content.encode('utf8')),
mimetype='text/css',
type='binary',
name=url,
@@ -501,7 +502,7 @@ class WebAsset(object):
with open(self._filename, 'rb') as fp:
return fp.read().decode('utf-8')
else:
- return self._ir_attach['datas'].decode('base64').decode('utf-8')
+ return base64.b64decode(self._ir_attach['datas']).decode('utf-8')
except UnicodeDecodeError:
raise AssetError('%s is not utf-8 encoded.' % self.name)
except IOError:
diff --git a/odoo/addons/base/ir/ir_qweb/fields.py b/odoo/addons/base/ir/ir_qweb/fields.py
index 6b9b0536b1a..27d13d3076c 100644
--- a/odoo/addons/base/ir/ir_qweb/fields.py
+++ b/odoo/addons/base/ir/ir_qweb/fields.py
@@ -1,12 +1,12 @@
# -*- coding: utf-8 -*-
+import base64
import re
from collections import OrderedDict
from io import BytesIO
from odoo import api, fields, models, _
from PIL import Image
import babel
-from odoo.tools import html_escape as escape, posix_to_ldml, safe_eval, float_utils, format_date
-from .qweb import unicodifier
+from odoo.tools import html_escape as escape, posix_to_ldml, safe_eval, float_utils, format_date, pycompat
import logging
_logger = logging.getLogger(__name__)
@@ -19,7 +19,7 @@ def nl2br(string):
:param str string:
:rtype: unicode
"""
- return unicodifier(string).replace(u'\n', u'
\n') + return pycompat.to_text(string).replace(u'\n', u'
\n') def html_escape(string, options): """ Automatically escapes content unless options['html-escape'] @@ -88,7 +88,7 @@ class FieldConverter(models.AbstractModel): Converts a single value to its HTML version/output :rtype: unicode """ - return html_escape(unicodifier(value) or u'', options) + return html_escape(pycompat.to_text(value), options) @api.model def record_to_html(self, record, field_name, options): @@ -123,7 +123,7 @@ class IntegerConverter(models.AbstractModel): @api.model def value_to_html(self, value, options): - return unicodifier(self.user_lang().format('%d', value, grouping=True).replace(r'-', u'\u2011')) + return pycompat.to_text(self.user_lang().format('%d', value, grouping=True).replace(r'-', u'\u2011')) class FloatConverter(models.AbstractModel): @@ -152,7 +152,7 @@ class FloatConverter(models.AbstractModel): if precision is None: formatted = re.sub(r'(?:(0|\d+?)0+)$', r'\1', formatted) - return unicodifier(formatted) + return pycompat.to_text(formatted) @api.model def record_to_html(self, record, field_name, options): @@ -182,7 +182,7 @@ class DateTimeConverter(models.AbstractModel): lang = self.user_lang() locale = babel.Locale.parse(lang.code) - if isinstance(value, basestring): + if isinstance(value, pycompat.string_types): value = fields.Datetime.from_string(value) value = fields.Datetime.context_timestamp(self, value) @@ -200,7 +200,7 @@ class DateTimeConverter(models.AbstractModel): if options and options.get('hide_seconds'): pattern = pattern.replace(":ss", "").replace(":s", "") - return unicodifier(babel.dates.format_datetime(value, format=pattern, locale=locale)) + return pycompat.to_text(babel.dates.format_datetime(value, format=pattern, locale=locale)) class TextConverter(models.AbstractModel): @@ -223,7 +223,7 @@ class SelectionConverter(models.AbstractModel): def value_to_html(self, value, options): if not value: return '' - return html_escape(unicodifier(options['selection'][value]) or u'', options) + return html_escape(pycompat.to_text(options['selection'][value]) or u'', options) @api.model def record_to_html(self, record, field_name, options): @@ -252,7 +252,7 @@ class HTMLConverter(models.AbstractModel): @api.model def value_to_html(self, value, options): - return unicodifier(value) or u'' + return pycompat.to_text(value) class ImageConverter(models.AbstractModel): @@ -269,15 +269,15 @@ class ImageConverter(models.AbstractModel): @api.model def value_to_html(self, value, options): - try: - image = Image.open(BytesIO(value.decode('base64'))) + try: # FIXME: maaaaaybe it could also take raw bytes? + image = Image.open(BytesIO(base64.b64decode(value))) image.verify() except IOError: raise ValueError("Non-image binary fields can not be converted to HTML") except: # image.verify() throws "suitable exceptions", I have no idea what they are raise ValueError("Invalid image content") - return unicodifier('
' % (Image.MIME[image.format], value))
+ return u'' % (Image.MIME[image.format], value.decode('ascii'))
class MonetaryConverter(models.AbstractModel):
@@ -398,13 +398,13 @@ class RelativeDatetimeConverter(models.AbstractModel):
def value_to_html(self, value, options):
locale = babel.Locale.parse(self.user_lang().code)
- if isinstance(value, basestring):
+ if isinstance(value, pycompat.string_types):
value = fields.Datetime.from_string(value)
# value should be a naive datetime in UTC. So is fields.Datetime.now()
reference = fields.Datetime.from_string(options['now'])
- return unicodifier(babel.dates.format_timedelta(value - reference, add_direction=True, locale=locale))
+ return pycompat.to_text(babel.dates.format_timedelta(value - reference, add_direction=True, locale=locale))
@api.model
def record_to_html(self, record, field_name, options):
@@ -427,8 +427,8 @@ class BarcodeConverter(models.AbstractModel):
barcode = self.env['ir.actions.report'].barcode(
barcode_type,
value,
- **dict((key, value) for key, value in options.items() if key in ['width', 'height', 'humanreadable']))
- return unicodifier('' % ('png', barcode.encode('base64')))
+ **{key: value for key, value in options.items() if key in ['width', 'height', 'humanreadable']})
+ return u'
' % base64.b64encode(barcode).decode('ascii')
@api.model
def from_html(self, model, field, element):
@@ -481,4 +481,4 @@ class QwebView(models.AbstractModel):
view = view.with_context(object=record)
- return unicodifier(view.render(view._context, engine='ir.qweb'))
+ return pycompat.to_text(view.render(view._context, engine='ir.qweb'))
diff --git a/odoo/addons/base/ir/ir_qweb/ir_qweb.py b/odoo/addons/base/ir/ir_qweb/ir_qweb.py
index 102b36e0898..bd40a2ce76c 100644
--- a/odoo/addons/base/ir/ir_qweb/ir_qweb.py
+++ b/odoo/addons/base/ir/ir_qweb/ir_qweb.py
@@ -169,7 +169,7 @@ class IrQWeb(models.AbstractModel, QWeb):
if field_options and 'monetary' in field_options:
try:
options = "{'widget': 'monetary'"
- for k, v in pycompat.items(json.loads(field_options)):
+ for k, v in json.loads(field_options).items():
if k in ('display_currency', 'from_currency'):
options = "%s, '%s': %s" % (options, k, v)
else:
@@ -218,8 +218,8 @@ class IrQWeb(models.AbstractModel, QWeb):
files = []
remains = []
for el in html.fragments_fromstring(template):
- if isinstance(el, basestring):
- remains.append(el)
+ if isinstance(el, pycompat.string_types):
+ remains.append(pycompat.to_text(el))
elif isinstance(el, html.HtmlElement):
href = el.get('href', '')
src = el.get('src', '')
@@ -243,10 +243,10 @@ class IrQWeb(models.AbstractModel, QWeb):
filename = get_resource_path(*path) if path else None
files.append({'atype': atype, 'url': src, 'filename': filename, 'content': el.text, 'media': media})
else:
- remains.append(html.tostring(el))
+ remains.append(html.tostring(el, encoding='unicode'))
else:
try:
- remains.append(html.tostring(el))
+ remains.append(html.tostring(el, encoding='unicode'))
except Exception:
# notYETimplementederror
raise NotImplementedError
diff --git a/odoo/addons/base/ir/ir_qweb/qweb.py b/odoo/addons/base/ir/ir_qweb/qweb.py
index 69a01635f2d..43c10fe19f0 100644
--- a/odoo/addons/base/ir/ir_qweb/qweb.py
+++ b/odoo/addons/base/ir/ir_qweb/qweb.py
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
import ast
import logging
+import os.path
import re
import traceback
@@ -176,13 +177,6 @@ class QWebException(Exception):
# Avoid DeprecationWarning while still remaining compatible with werkzeug pre-0.9
escape = (lambda text: _escape(text, quote=True)) if getattr(werkzeug, '__version__', '0.0') < '0.9.0' else _escape
-def unicodifier(val):
- if val is None or val is False:
- return u''
- if isinstance(val, str):
- return val.decode('utf-8')
- return unicode(val)
-
def foreach_iterator(base_ctx, enum, name):
ctx = base_ctx.copy()
if not enum:
@@ -193,7 +187,7 @@ def foreach_iterator(base_ctx, enum, name):
if isinstance(enum, Sized):
ctx["%s_size" % name] = size = len(enum)
if isinstance(enum, Mapping):
- enum = pycompat.items(enum)
+ enum = enum.items()
else:
enum = pycompat.izip(*tee(enum))
value_key = '%s_value' % name
@@ -246,7 +240,7 @@ class frozendict(dict):
def update(self, *args, **kwargs):
raise NotImplementedError("'update' not supported on frozendict")
def __hash__(self):
- return hash(frozenset((key, freehash(val)) for key, val in pycompat.items(self)))
+ return hash(frozenset((key, freehash(val)) for key, val in self.items()))
####################################
@@ -380,10 +374,11 @@ class QWeb(object):
if isinstance(document, etree._Element):
element = document
document = etree.tostring(document)
- elif document.startswith("'))] + content
else:
@@ -789,10 +785,10 @@ class QWeb(object):
# Etree will also remove the ns prefixes indirection in the attributes. As we only have
# the namespace definition, we'll use an nsmap where the keys are the definitions and
# the values the prefixes in order to get back the right prefix and restore it.
- nsprefixmap = {v: k for k, v in itertools.chain(pycompat.items(options['nsmap']), pycompat.items(el.nsmap))}
+ nsprefixmap = {v: k for k, v in itertools.chain(options['nsmap'].items(), el.nsmap.items())}
nodes = []
- for key, value in pycompat.items(el.attrib):
+ for key, value in el.attrib.items():
if not key.startswith('t-'):
attrib_qname = etree.QName(key)
if attrib_qname.namespace:
@@ -807,7 +803,7 @@ class QWeb(object):
We do not support namespaced dynamic attributes.
"""
nodes = []
- for name, value in pycompat.items(el.attrib):
+ for name, value in el.attrib.items():
if name.startswith('t-attf-'):
nodes.append((name[7:], self._compile_format(value)))
elif name.startswith('t-att-'):
@@ -833,7 +829,7 @@ class QWeb(object):
def _compile_all_attributes(self, el, options, attr_already_created=False):
""" Compile the attributes of the given elements into a list of AST nodes. """
body = []
- if any(name.startswith('t-att') or not name.startswith('t-') for name, value in pycompat.items(el.attrib)):
+ if any(name.startswith('t-att') or not name.startswith('t-') for name, value in el.attrib.items()):
if not attr_already_created:
attr_already_created = True
body.append(
@@ -874,22 +870,22 @@ class QWeb(object):
)))
if attr_already_created:
- # for name, value in pycompat.items(t_attrs):
+ # for name, value in t_attrs.items():
# if value or isinstance(value, basestring)):
# append(u' ')
# append(name)
# append(u'="')
- # append(escape(unicodifier((value)))
+ # append(escape(to_text((value)))
# append(u'"')
body.append(ast.For(
target=ast.Tuple(elts=[ast.Name(id='name', ctx=ast.Store()), ast.Name(id='value', ctx=ast.Store())], ctx=ast.Store()),
iter=ast.Call(
func=ast.Attribute(
- value=ast.Name(id='pycompat', ctx=ast.Load()),
+ value=ast.Name(id='t_attrs', ctx=ast.Load()),
attr='items',
ctx=ast.Load()
),
- args=[ast.Name(id='t_attrs', ctx=ast.Load())], keywords=[],
+ args=[], keywords=[],
starargs=None, kwargs=None
),
body=[ast.If(
@@ -901,7 +897,7 @@ class QWeb(object):
func=ast.Name(id='isinstance', ctx=ast.Load()),
args=[
ast.Name(id='value', ctx=ast.Load()),
- ast.Name(id='basestring', ctx=ast.Load())
+ ast.Name(id='string_types', ctx=ast.Load())
],
keywords=[],
starargs=None, kwargs=None
@@ -915,7 +911,7 @@ class QWeb(object):
self._append(ast.Call(
func=ast.Name(id='escape', ctx=ast.Load()),
args=[ast.Call(
- func=ast.Name(id='unicodifier', ctx=ast.Load()),
+ func=ast.Name(id='to_text', ctx=ast.Load()),
args=[ast.Name(id='value', ctx=ast.Load())], keywords=[],
starargs=None, kwargs=None
)], keywords=[],
@@ -946,7 +942,7 @@ class QWeb(object):
# If `el` introduced new namespaces, write them as attribute by using the
# `extra_attrib` dict.
- for ns_prefix, ns_definition in set(pycompat.items(el.nsmap)) - set(pycompat.items(options['nsmap'])):
+ for ns_prefix, ns_definition in set(el.nsmap.items()) - set(options['nsmap'].items()):
if ns_prefix is None:
extra_attrib['xmlns'] = ns_definition
else:
@@ -955,7 +951,7 @@ class QWeb(object):
if unqualified_el_tag == 't':
return content
- body = [self._append(ast.Str(u'<%s%s' % (el_tag, u''.join([u' %s="%s"' % (name, escape(unicodifier(value))) for name, value in pycompat.items(extra_attrib)]))))]
+ body = [self._append(ast.Str(u'<%s%s' % (el_tag, u''.join([u' %s="%s"' % (name, escape(pycompat.to_text(value))) for name, value in extra_attrib.items()]))))]
body.extend(self._compile_all_attributes(el, options, attr_already_created))
if unqualified_el_tag in self._void_elements:
body.append(self._append(ast.Str(u'/>')))
@@ -1044,7 +1040,7 @@ class QWeb(object):
def _compile_directive_content(self, el, options):
body = []
if el.text is not None:
- body.append(self._append(ast.Str(unicodifier(el.text))))
+ body.append(self._append(ast.Str(pycompat.to_text(el.text))))
if el.getchildren():
for item in el:
# ignore comments & processing instructions
@@ -1135,7 +1131,7 @@ class QWeb(object):
)]
def _compile_tail(self, el):
- return el.tail is not None and [self._append(ast.Str(unicodifier(el.tail)))] or []
+ return el.tail is not None and [self._append(ast.Str(pycompat.to_text(el.tail)))] or []
def _compile_directive_esc(self, el, options):
field_options = self._compile_widget_options(el, 'esc')
@@ -1148,14 +1144,14 @@ class QWeb(object):
return content + self._compile_widget_value(el, options)
def _compile_widget(self, el, expression, field_options, escape=None):
- # if isinstance(value, basestring):
- # value = escape(unicodifier(value))
+ # if isinstance(value, string_types):
+ # value = escape(to_text(value))
escaped = ast.If(
test=ast.Call(
func=ast.Name(id='isinstance', ctx=ast.Load()),
args=[
ast.Name(id='content', ctx=ast.Load()),
- ast.Name(id='basestring', ctx=ast.Load())
+ ast.Name(id='string_types', ctx=ast.Load())
], keywords=[],
starargs=None, kwargs=None
),
@@ -1164,7 +1160,7 @@ class QWeb(object):
value=ast.Call(
func=ast.Name(id=escape, ctx=ast.Load()),
args=[ast.Call(
- func=ast.Name(id='unicodifier', ctx=ast.Load()),
+ func=ast.Name(id='to_text', ctx=ast.Load()),
args=[ast.Name(id='content', ctx=ast.Load())], keywords=[],
starargs=None, kwargs=None
)], keywords=[],
@@ -1332,7 +1328,7 @@ class QWeb(object):
]
# if content is not None:
- # display the tag (unicodifier(content))
+ # display the tag (to_text(content))
# else
# if default_content:
# display the tag with default content
@@ -1341,7 +1337,7 @@ class QWeb(object):
return [self._if_content_is_not_Falsy(
body=self._compile_tag(el, [self._append(
ast.Call(
- func=ast.Name(id='unicodifier', ctx=ast.Load()),
+ func=ast.Name(id='to_text', ctx=ast.Load()),
args=[ast.Name(id='content', ctx=ast.Load())], keywords=[],
starargs=None, kwargs=None
)
@@ -1460,8 +1456,8 @@ class QWeb(object):
# make the nsmap an ast dict
keys = []
values = []
- for key, value in pycompat.items(options['nsmap']):
- if isinstance(key, basestring):
+ for key, value in options['nsmap'].items():
+ if isinstance(key, pycompat.string_types):
keys.append(ast.Str(s=key))
elif key is None:
keys.append(ast.Name(id='None', ctx=ast.Load()))
@@ -1547,7 +1543,7 @@ class QWeb(object):
def _compile_strexpr(self, expr):
# ensure result is unicode
return ast.Call(
- func=ast.Name(id='unicodifier', ctx=ast.Load()),
+ func=ast.Name(id='to_text', ctx=ast.Load()),
args=[self._compile_expr(expr)], keywords=[],
starargs=None, kwargs=None
)
@@ -1591,7 +1587,7 @@ class QWeb(object):
for m in _FORMAT_REGEX.finditer(f):
literal = f[base_idx:m.start()]
if literal:
- elts.append(ast.Str(literal if isinstance(literal, unicode) else literal.decode('utf-8')))
+ elts.append(ast.Str(literal if isinstance(literal, pycompat.text_type) else literal.decode('utf-8')))
expr = m.group(1) or m.group(2)
elts.append(self._compile_strexpr(expr))
@@ -1599,7 +1595,7 @@ class QWeb(object):
# string past last regex match
literal = f[base_idx:]
if literal:
- elts.append(ast.Str(literal if isinstance(literal, unicode) else literal.decode('utf-8')))
+ elts.append(ast.Str(literal if isinstance(literal, pycompat.text_type) else literal.decode('utf-8')))
return reduce(lambda acc, it: ast.BinOp(
left=acc,
diff --git a/odoo/addons/base/ir/ir_sequence.py b/odoo/addons/base/ir/ir_sequence.py
index aa893e3f316..105f0f9bbf4 100644
--- a/odoo/addons/base/ir/ir_sequence.py
+++ b/odoo/addons/base/ir/ir_sequence.py
@@ -6,7 +6,6 @@ import pytz
from odoo import api, fields, models, _
from odoo.exceptions import UserError
-from odoo.tools import pycompat
_logger = logging.getLogger(__name__)
@@ -195,7 +194,7 @@ class IrSequence(models.Model):
'weekday': '%w', 'h24': '%H', 'h12': '%I', 'min': '%M', 'sec': '%S'
}
res = {}
- for key, format in pycompat.items(sequences):
+ for key, format in sequences.items():
res[key] = effective_date.strftime(format)
res['range_' + key] = range_date.strftime(format)
res['current_' + key] = now.strftime(format)
diff --git a/odoo/addons/base/ir/ir_translation.py b/odoo/addons/base/ir/ir_translation.py
index cd954778a92..f77d84e758b 100644
--- a/odoo/addons/base/ir/ir_translation.py
+++ b/odoo/addons/base/ir/ir_translation.py
@@ -128,7 +128,7 @@ class IrTranslationImport(object):
env = api.Environment(cr, SUPERUSER_ID, {})
src_relevant_fields = []
for model in env:
- for field_name, field in pycompat.items(env[model]._fields):
+ for field_name, field in env[model]._fields.items():
if hasattr(field, 'translate') and callable(field.translate):
src_relevant_fields.append("%s,%s" % (model, field_name))
@@ -394,7 +394,7 @@ class IrTranslation(models.Model):
# always pass unicode so we can remove the string encoding/decoding.
if not lang:
return tools.ustr(source or '')
- if isinstance(types, basestring):
+ if isinstance(types, pycompat.string_types):
types = (types,)
if res_id:
if isinstance(res_id, pycompat.integer_types):
@@ -531,7 +531,7 @@ class IrTranslation(models.Model):
# check for read/write access on translated field records
fmode = 'read' if mode == 'read' else 'write'
- for mname, ids in pycompat.items(model_ids):
+ for mname, ids in model_ids.items():
records = self.env[mname].browse(ids)
records.check_access_rights(fmode)
records.check_field_access_rights(fmode, model_fields[mname])
@@ -646,7 +646,7 @@ class IrTranslation(models.Model):
return ['&', ('res_id', '=', rec.id), ('name', '=', name)]
# insert missing translations, and extend domain for related fields
- for name, fld in pycompat.items(record._fields):
+ for name, fld in record._fields.items():
if not fld.translate:
continue
diff --git a/odoo/addons/base/ir/ir_ui_view.py b/odoo/addons/base/ir/ir_ui_view.py
index d70ee4cf951..085200a7475 100644
--- a/odoo/addons/base/ir/ir_ui_view.py
+++ b/odoo/addons/base/ir/ir_ui_view.py
@@ -29,7 +29,7 @@ from odoo.tools.convert import _fix_multiple_roots
from odoo.tools.parse_version import parse_version
from odoo.tools.safe_eval import safe_eval
from odoo.tools.view_validation import valid_view
-from odoo.tools.translate import encode, xml_translate, TRANSLATED_ATTRS
+from odoo.tools.translate import xml_translate, TRANSLATED_ATTRS
_logger = logging.getLogger(__name__)
@@ -110,7 +110,7 @@ def get_view_arch_from_file(filename, xmlid):
if node.tag == 'record':
field = node.find('field[@name="arch"]')
_fix_multiple_roots(field)
- inner = ''.join([etree.tostring(child) for child in field.iterchildren()])
+ inner = u''.join([etree.tostring(child, encoding='unicode') for child in field.iterchildren()])
return field.text + inner
elif node.tag == 'template':
# The following dom operations has been copied from convert.py's _tag_template()
@@ -120,7 +120,7 @@ def get_view_arch_from_file(filename, xmlid):
else:
node.tag = 'data'
node.attrib.pop('id', None)
- return etree.tostring(node)
+ return etree.tostring(node, encoding='unicode')
_logger.warning("Could not find view arch definition in file '%s' for xmlid '%s'", filename, xmlid)
return None
@@ -233,7 +233,7 @@ actual arch.
else:
_logger.warning("View %s: Full path [%s] cannot be found.", view.xml_id, view.arch_fs)
arch_fs = False
- view.arch = arch_fs or view.arch_db
+ view.arch = pycompat.to_text(arch_fs or view.arch_db)
def _inverse_arch(self):
for view in self:
@@ -269,7 +269,7 @@ actual arch.
view.model_data_id = data['id']
def _search_model_data_id(self, operator, value):
- name = 'name' if isinstance(value, basestring) else 'id'
+ name = 'name' if isinstance(value, pycompat.string_types) else 'id'
domain = [('model', '=', 'ir.ui.view'), (name, operator, value)]
data = self.env['ir.model.data'].sudo().search(domain)
return [('id', 'in', data.mapped('res_id'))]
@@ -313,7 +313,7 @@ actual arch.
# Sanity checks: the view should not break anything upon rendering!
# Any exception raised below will cause a transaction rollback.
for view in self:
- view_arch = etree.fromstring(encode(view.arch))
+ view_arch = etree.fromstring(view.arch.encode('utf-8'))
view._valid_inheritance(view_arch)
view_def = view.read_combined(['arch'])
view_arch_utf8 = view_def['arch']
@@ -702,7 +702,7 @@ actual arch.
# and apply inheritance
arch = self.apply_view_inheritance(arch_tree, root.id, self.model)
- return dict(view_data, arch=etree.tostring(arch, encoding='utf-8'))
+ return dict(view_data, arch=etree.tostring(arch, encoding='unicode'))
def _apply_group(self, model, node, modifiers, fields):
"""Apply group restrictions, may be set at view level or model level::
@@ -845,7 +845,7 @@ actual arch.
collect(arch, self.env[model_name])
- for field, nodes in pycompat.items(field_nodes):
+ for field, nodes in field_nodes.items():
# if field should trigger an onchange, add on_change="1" on the
# nodes referring to field
model = self.env[field.model_name]
@@ -910,7 +910,7 @@ actual arch.
not self._context.get(action, True) and is_base_model):
node.set(action, 'false')
- arch = etree.tostring(node, encoding="utf-8").replace('\t', '')
+ arch = etree.tostring(node, encoding="unicode").replace('\t', '')
for k in list(fields):
if k not in fields_def:
del fields[k]
@@ -942,7 +942,7 @@ actual arch.
arch_tree = etree.fromstring(arch)
self.distribute_branding(arch_tree)
root = E.templates(arch_tree)
- arch = etree.tostring(root, encoding='utf-8', xml_declaration=True)
+ arch = etree.tostring(root, encoding='unicode')
return arch
@api.model
@@ -1102,12 +1102,12 @@ actual arch.
Model = self.env[model]
Node = self.env[node_obj]
- for model_key, model_value in pycompat.items(Model._fields):
+ for model_key, model_value in Model._fields.items():
if model_value.type == 'one2many':
if model_value.comodel_name == node_obj:
_Node_Field = model_key
_Model_Field = model_value.inverse_name
- for node_key, node_value in pycompat.items(Node._fields):
+ for node_key, node_value in Node._fields.items():
if node_value.type == 'one2many':
if node_value.comodel_name == conn_obj:
# _Source_Field = "Incoming Arrows" (connected via des_node)
@@ -1184,7 +1184,7 @@ actual arch.
xmlid_filter = "AND md.name IN %s"
names = tuple(
name
- for (xmod, name), (model, res_id) in pycompat.items(self.pool.model_data_reference_ids)
+ for (xmod, name), (model, res_id) in self.pool.model_data_reference_ids.items()
if xmod == module and model == self._name
)
if not names:
diff --git a/odoo/addons/base/ir/ir_values.py b/odoo/addons/base/ir/ir_values.py
index ace2998b2b3..851c4705738 100644
--- a/odoo/addons/base/ir/ir_values.py
+++ b/odoo/addons/base/ir/ir_values.py
@@ -96,8 +96,8 @@ class IrValues(models.Model):
"helper field for binding an action, will "
"automatically set the correct reference")
- value = fields.Text(help="Default value (pickled) or reference to an action")
- value_unpickle = fields.Text(string='Default value or action reference',
+ value = fields.Binary(help="Default value (pickled) or reference to an action")
+ value_unpickle = fields.Binary(string='Default value or action reference',
compute='_value_unpickle', inverse='_value_pickle')
key = fields.Selection([('action', 'Action'), ('default', 'Default')],
string='Type', index=True, required=True, default='action',
@@ -211,8 +211,8 @@ class IrValues(models.Model):
match)
:return: the newly created ir.values entry
"""
- if isinstance(value, unicode):
- value = value.encode('utf8')
+ if isinstance(value, pycompat.string_types):
+ value = pycompat.to_native(value)
if company_id is True:
# should be company-specific, need to get company id
company_id = self.env.user.company_id.id
@@ -261,7 +261,7 @@ class IrValues(models.Model):
('company_id', '=', company_id)
]
defaults = self.search(search_criteria)
- return pickle.loads(defaults.value.encode('utf-8')) if defaults else None
+ return pickle.loads(defaults.value) if defaults else None
@api.model
def get_defaults(self, model, condition=False):
@@ -313,9 +313,9 @@ class IrValues(models.Model):
# keep only the highest priority default for each field
defaults = {}
for row in self._cr.dictfetchall():
- value = pickle.loads(row['value'].encode('utf-8'))
+ value = pickle.loads(row['value'])
defaults.setdefault(row['name'], (row['id'], row['name'], value))
- return list(pycompat.values(defaults))
+ return list(defaults.values())
# use ormcache: this is called a lot by BaseModel.default_get()!
@api.model
@@ -347,11 +347,13 @@ class IrValues(models.Model):
specific record of the model, not all records.
:return: the newly created ir.values entry
"""
- assert isinstance(action, basestring) and ',' in action, \
+ assert isinstance(action, pycompat.string_types) and ',' in action, \
'Action definition must be an action reference, e.g. "ir.actions.act_window,42"'
assert action_slot in ACTION_SLOTS, \
'Action slot (%s) must be one of: %r' % (action_slot, ACTION_SLOTS)
+ action = action.encode('utf-8')
+
# remove existing action definition of same slot and value
search_criteria = [
('key', '=', 'action'),
@@ -405,7 +407,7 @@ class IrValues(models.Model):
for id, name, value in self._cr.fetchall():
if not value:
continue # skip if undefined
- action_model, action_id = value.split(',')
+ action_model, action_id = bytes(value).decode('utf-8').split(',')
if action_model not in self.env:
continue # unknown model? skip it!
action = self.env[action_model].browse(int(action_id))
@@ -426,4 +428,4 @@ class IrValues(models.Model):
results[name] = (id, name, action_def)
except (AccessError, MissingError):
continue
- return sorted(pycompat.values(results))
+ return sorted(results.values())
diff --git a/odoo/addons/base/module/module.py b/odoo/addons/base/module/module.py
index 32c875c3fd8..cc77b392a18 100644
--- a/odoo/addons/base/module/module.py
+++ b/odoo/addons/base/module/module.py
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
+import base64
from collections import defaultdict
from operator import attrgetter
import importlib
@@ -220,7 +221,7 @@ class Module(models.Model):
path = modules.module.get_module_icon(module.name)
if path:
with tools.file_open(path, 'rb') as image_file:
- module.icon_image = image_file.read().encode('base64')
+ module.icon_image = base64.b64encode(image_file.read())
name = fields.Char('Technical Name', readonly=True, required=True, index=True)
category_id = fields.Many2one('ir.module.category', string='Category', readonly=True, index=True)
@@ -644,7 +645,7 @@ class Module(models.Model):
updated_values = {}
for key in values:
old = getattr(mod, key)
- updated = tools.ustr(values[key]) if isinstance(values[key], basestring) else values[key]
+ updated = tools.ustr(values[key]) if isinstance(values[key], pycompat.string_types) else values[key]
if (old or updated) and updated != old:
updated_values[key] = values[key]
if terp.get('installable', True) and mod.state == 'uninstallable':
@@ -693,7 +694,7 @@ class Module(models.Model):
_logger.debug('Install from url: %r', urls)
try:
# 1. Download & unzip missing modules
- for module_name, url in pycompat.items(urls):
+ for module_name, url in urls.items():
if not url:
continue # nothing to download, local version is already the last one
@@ -714,7 +715,7 @@ class Module(models.Model):
assert os.path.isdir(os.path.join(tmp, module_name))
# 2a. Copy/Replace module source in addons path
- for module_name, url in pycompat.items(urls):
+ for module_name, url in urls.items():
if module_name == OPENERP or not url:
continue # OPENERP is special case, handled below, and no URL means local module
module_path = modules.get_module_path(module_name, downloaded=True, display_warning=False)
@@ -746,7 +747,7 @@ class Module(models.Model):
self.update_list()
- with_urls = [module_name for module_name, url in pycompat.items(urls) if url]
+ with_urls = [module_name for module_name, url in urls.items() if url]
downloaded = self.search([('name', 'in', with_urls)])
installed = self.search([('id', 'in', downloaded.ids), ('state', '=', 'installed')])
diff --git a/odoo/addons/base/module/report/ir_module_reference_print.py b/odoo/addons/base/module/report/ir_module_reference_print.py
index a933cdd9430..03632644159 100644
--- a/odoo/addons/base/module/report/ir_module_reference_print.py
+++ b/odoo/addons/base/module/report/ir_module_reference_print.py
@@ -2,7 +2,6 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from odoo import api, models
-from odoo.tools import pycompat
class IrModelReferenceReport(models.AbstractModel):
@@ -23,7 +22,7 @@ class IrModelReferenceReport(models.AbstractModel):
if data:
res_ids = data.mapped('res_id')
fnames = self.env['ir.model.fields'].browse(res_ids).mapped('name')
- return sorted(pycompat.items(self.env[model].fields_get(fnames)))
+ return sorted(self.env[model].fields_get(fnames).items())
return []
@api.model
diff --git a/odoo/addons/base/res/ir_property.py b/odoo/addons/base/res/ir_property.py
index ec086fb6c61..73f8aafccad 100644
--- a/odoo/addons/base/res/ir_property.py
+++ b/odoo/addons/base/res/ir_property.py
@@ -217,7 +217,7 @@ class Property(models.Model):
prop.write({'value': value})
# create new properties for records that do not have one yet
- for ref, id in pycompat.items(refs):
+ for ref, id in refs.items():
value = clean(values[id])
if value != default_value:
self.create({
diff --git a/odoo/addons/base/res/res_bank.py b/odoo/addons/base/res/res_bank.py
index e1f9bb85f00..5a397fcc831 100644
--- a/odoo/addons/base/res/res_bank.py
+++ b/odoo/addons/base/res/res_bank.py
@@ -2,8 +2,11 @@
import re
+import collections
+
from odoo import api, fields, models
from odoo.osv import expression
+from odoo.tools import pycompat
def sanitize_account_number(acc_number):
@@ -88,7 +91,7 @@ class ResPartnerBank(models.Model):
if args[pos][0] == 'acc_number':
op = args[pos][1]
value = args[pos][2]
- if hasattr(value, '__iter__'):
+ if not isinstance(value, pycompat.string_types) and isinstance(value, collections.Iterable):
value = [sanitize_account_number(i) for i in value]
else:
value = sanitize_account_number(value)
diff --git a/odoo/addons/base/res/res_company.py b/odoo/addons/base/res/res_company.py
index 387ba1afe1c..5a711c6b9c0 100644
--- a/odoo/addons/base/res/res_company.py
+++ b/odoo/addons/base/res/res_company.py
@@ -1,12 +1,11 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
+import base64
import os
import re
from odoo import api, fields, models, tools, _
from odoo.exceptions import ValidationError
-from odoo.tools import pycompat
class Company(models.Model):
@@ -28,7 +27,7 @@ class Company(models.Model):
return super(Company, self).copy(default)
def _get_logo(self):
- return open(os.path.join(tools.config['root_path'], 'addons', 'base', 'res', 'res_company_logo.png'), 'rb') .read().encode('base64')
+ return base64.b64encode(open(os.path.join(tools.config['root_path'], 'addons', 'base', 'res', 'res_company_logo.png'), 'rb') .read())
@api.model
def _get_euro(self):
@@ -154,7 +153,7 @@ class Company(models.Model):
if self.country_id:
res['domain']['state_id'] = [('country_id', '=', self.country_id.id)]
values = self.on_change_country(self.country_id.id)['value']
- for fname, value in pycompat.items(values):
+ for fname, value in values.items():
setattr(self, fname, value)
return res
diff --git a/odoo/addons/base/res/res_config.py b/odoo/addons/base/res/res_config.py
index d5c1ac59717..4176d57ae52 100644
--- a/odoo/addons/base/res/res_config.py
+++ b/odoo/addons/base/res/res_config.py
@@ -9,7 +9,7 @@ from lxml import etree
from odoo import api, models, registry, SUPERUSER_ID, _
from odoo.exceptions import AccessError, RedirectWarning, UserError
-from odoo.tools import ustr, pycompat
+from odoo.tools import ustr
_logger = logging.getLogger(__name__)
@@ -247,7 +247,7 @@ class ResConfigInstaller(models.TransientModel, ResConfigModuleInstallationMixin
:returns: a list of all installed modules in this installer
:rtype: recordset (collection of Record)
"""
- selectable = [name for name, field in pycompat.items(self._fields)
+ selectable = [name for name, field in self._fields.items()
if field.type == 'boolean']
return self.env['ir.module.module'].search([('name', 'in', selectable),
('state', 'in', ['to install', 'installed', 'to upgrade'])])
@@ -272,7 +272,7 @@ class ResConfigInstaller(models.TransientModel, ResConfigModuleInstallationMixin
"""
base = set(module_name
for installer in self.read()
- for module_name, to_install in pycompat.items(installer)
+ for module_name, to_install in installer.items()
if self._fields[module_name].type == 'boolean' and to_install)
hooks_results = set()
@@ -282,7 +282,7 @@ class ResConfigInstaller(models.TransientModel, ResConfigModuleInstallationMixin
hooks_results.update(hook() or set())
additionals = set(module
- for requirements, consequences in pycompat.items(self._install_if)
+ for requirements, consequences in self._install_if.items()
if base.issuperset(requirements)
for module in consequences)
@@ -405,7 +405,7 @@ class ResConfigSettings(models.TransientModel, ResConfigModuleInstallationMixin)
node.set("on_change",
"onchange_module(%s, '%s')" % (field, field))
- ret_val['arch'] = etree.tostring(doc)
+ ret_val['arch'] = etree.tostring(doc, encoding='unicode')
return ret_val
@api.multi
@@ -442,7 +442,7 @@ class ResConfigSettings(models.TransientModel, ResConfigModuleInstallationMixin)
ref = self.env.ref
defaults, groups, modules, others = [], [], [], []
- for name, field in pycompat.items(self._fields):
+ for name, field in self._fields.items():
if name.startswith('default_') and hasattr(field, 'default_model'):
defaults.append((name, field.default_model, name[8:]))
elif name.startswith('group_') and field.type in ('boolean', 'selection') and \
diff --git a/odoo/addons/base/res/res_lang.py b/odoo/addons/base/res/res_lang.py
index f4e2d7a1578..1cdc8a5db43 100644
--- a/odoo/addons/base/res/res_lang.py
+++ b/odoo/addons/base/res/res_lang.py
@@ -8,7 +8,6 @@ import re
from operator import itemgetter
from odoo import api, fields, models, tools, _
-from odoo.tools import pycompat
from odoo.tools.safe_eval import safe_eval
from odoo.exceptions import UserError, ValidationError
@@ -126,7 +125,7 @@ class Lang(models.Model):
# For some locales, nl_langinfo returns a D_FMT/T_FMT that contains
# unsupported '%-' patterns, e.g. for cs_CZ
format = format.replace('%-', '%')
- for pattern, replacement in pycompat.items(tools.DATETIME_FORMATS_MAP):
+ for pattern, replacement in tools.DATETIME_FORMATS_MAP.items():
format = format.replace(pattern, replacement)
return str(format)
diff --git a/odoo/addons/base/res/res_partner.py b/odoo/addons/base/res/res_partner.py
index 5b73d6848cd..32772fa19a6 100644
--- a/odoo/addons/base/res/res_partner.py
+++ b/odoo/addons/base/res/res_partner.py
@@ -61,7 +61,7 @@ class FormatAddressMixin(models.AbstractModel):
except ValueError:
return arch
address_node.getparent().replace(address_node, sub_view_node)
- arch = etree.tostring(doc)
+ arch = etree.tostring(doc, encoding='unicode')
return arch
class PartnerCategory(models.Model):
@@ -337,7 +337,7 @@ class Partner(models.Model):
@api.depends('name', 'email')
def _compute_email_formatted(self):
for partner in self:
- partner.email_formatted = formataddr((partner.name, partner.email))
+ partner.email_formatted = formataddr((partner.name or u"False", partner.email or u"False"))
@api.depends('is_company')
def _compute_company_type(self):
@@ -665,7 +665,7 @@ class Partner(models.Model):
return partners.id or self.name_create(email)[0]
def _get_gravatar_image(self, email):
- email_hash = hashlib.md5(email.lower()).hexdigest()
+ email_hash = hashlib.md5(email.lower().encode('utf-8')).hexdigest()
url = "https://www.gravatar.com/avatar/" + email_hash
try:
res = requests.get(url, params={'d': '404', 's': '128'}, timeout=5)
diff --git a/odoo/addons/base/res/res_users.py b/odoo/addons/base/res/res_users.py
index 2a66c05a4aa..fa17d182fd5 100644
--- a/odoo/addons/base/res/res_users.py
+++ b/odoo/addons/base/res/res_users.py
@@ -107,7 +107,7 @@ class Groups(models.Model):
return expression.AND(domains)
else:
return expression.OR(domains)
- if isinstance(operand, basestring):
+ if isinstance(operand, pycompat.string_types):
lst = False
operand = [operand]
where = []
@@ -306,7 +306,7 @@ class Users(models.Model):
@api.model
def read_group(self, domain, fields, groupby, offset=0, limit=None, orderby=False, lazy=True):
- groupby_fields = set([groupby] if isinstance(groupby, basestring) else groupby)
+ groupby_fields = set([groupby] if isinstance(groupby, pycompat.string_types) else groupby)
if groupby_fields.intersection(USER_PRIVATE_FIELDS):
raise AccessError(_("Invalid 'group by' parameter"))
return super(Users, self).read_group(domain, fields, groupby, offset=offset, limit=limit, orderby=orderby, lazy=lazy)
@@ -739,7 +739,7 @@ class GroupsView(models.Model):
xml2.append({'class': "o_label_nowrap"})
xml = E.field(E.group(*(xml1), col="2"), E.group(*(xml2), col="4"), name="groups_id", position="replace")
xml.addprevious(etree.Comment("GENERATED AUTOMATICALLY BY GROUPS"))
- xml_content = etree.tostring(xml, pretty_print=True, xml_declaration=True, encoding="utf-8")
+ xml_content = etree.tostring(xml, pretty_print=True, encoding="unicode")
view.with_context(lang=None).write({'arch': xml_content, 'arch_fs': False})
def get_application_groups(self, domain):
@@ -761,7 +761,7 @@ class GroupsView(models.Model):
# determine sequence order: a group appears after its implied groups
order = {g: len(g.trans_implied_ids & gs) for g in gs}
# check whether order is total, i.e., sequence orders are distinct
- if len(set(pycompat.values(order))) == len(gs):
+ if len(set(order.values())) == len(gs):
return (app, 'selection', gs.sorted(key=order.get))
else:
return (app, 'boolean', gs)
@@ -775,7 +775,7 @@ class GroupsView(models.Model):
others += g
# build the result
res = []
- for app, gs in sorted(pycompat.items(by_app), key=lambda it: it[0].sequence or 0):
+ for app, gs in sorted(by_app.items(), key=lambda it: it[0].sequence or 0):
res.append(linearize(app, gs))
if others:
res.append((self.env['ir.module.category'], 'boolean', others))
@@ -815,7 +815,7 @@ class UsersView(models.Model):
add, rem = [], []
values1 = {}
- for key, val in pycompat.items(values):
+ for key, val in values.items():
if is_boolean_group(key):
(add if val else rem).append(get_boolean_group(key))
elif is_selection_groups(key):
diff --git a/odoo/addons/base/static/img/public_user-image.png b/odoo/addons/base/static/img/public_user-image.png
index e333176e3e4..e69de29bb2d 100644
Binary files a/odoo/addons/base/static/img/public_user-image.png and b/odoo/addons/base/static/img/public_user-image.png differ
diff --git a/odoo/addons/base/tests/test_api.py b/odoo/addons/base/tests/test_api.py
index 55cf1ff26b5..96fba1179b7 100644
--- a/odoo/addons/base/tests/test_api.py
+++ b/odoo/addons/base/tests/test_api.py
@@ -98,7 +98,7 @@ class TestAPI(common.TransactionCase):
self.assertIsRecordset(user.groups_id, 'res.groups')
partners = self.env['res.partner'].search([])
- for name, field in pycompat.items(partners._fields):
+ for name, field in partners._fields.items():
if field.type == 'many2one':
for p in partners:
self.assertIsRecord(p[name], field.comodel_name)
@@ -296,7 +296,7 @@ class TestAPI(common.TransactionCase):
self.assertItemsEqual(partners.ids, country_id_cache)
# partners' countries are ready for prefetching
- country_ids = set(cid for cids in pycompat.values(country_id_cache) for cid in cids)
+ country_ids = set(cid for cids in country_id_cache.values() for cid in cids)
self.assertTrue(len(country_ids) > 1)
self.assertItemsEqual(country_ids, partners._prefetch['res.country'])
@@ -482,7 +482,7 @@ class TestAPI(common.TransactionCase):
ps = self.env['res.partner'].search([])
# sort by model order
- qs = ps[:len(ps) / 2] + ps[len(ps) / 2:]
+ qs = ps[:len(ps) // 2] + ps[len(ps) // 2:]
self.assertEqual(qs.sorted().ids, ps.ids)
# sort by name, with a function or a field name
diff --git a/odoo/addons/base/tests/test_expression.py b/odoo/addons/base/tests/test_expression.py
index 07a087d0842..f27c376c9b5 100644
--- a/odoo/addons/base/tests/test_expression.py
+++ b/odoo/addons/base/tests/test_expression.py
@@ -5,7 +5,7 @@ import psycopg2
from odoo.models import BaseModel
from odoo.tests.common import TransactionCase
-from odoo.tools import mute_logger, pycompat
+from odoo.tools import mute_logger
from odoo.osv import expression
@@ -85,10 +85,10 @@ class TestExpression(TransactionCase):
'b ab': [cids['B'], cids['AB']],
}
pids = {}
- for name, cat_ids in pycompat.items(partners_config):
+ for name, cat_ids in partners_config.items():
pids[name] = partners.create({'name': name, 'category_id': [(6, 0, cat_ids)]}).id
- base_domain = [('id', 'in', list(pycompat.values(pids)))]
+ base_domain = [('id', 'in', list(pids.values()))]
def test(op, value, expected):
found_ids = partners.search(base_domain + [('category_id', op, value)]).ids
diff --git a/odoo/addons/base/tests/test_func.py b/odoo/addons/base/tests/test_func.py
index ac394cb9b79..66ad02f4e9d 100644
--- a/odoo/addons/base/tests/test_func.py
+++ b/odoo/addons/base/tests/test_func.py
@@ -4,7 +4,7 @@
import functools
import unittest
-from odoo.tools import frozendict
+from odoo.tools import frozendict, pycompat
from odoo.tools.func import compose
@@ -16,7 +16,7 @@ class TestCompose(unittest.TestCase):
def test_decorator(self):
""" ensure compose() can be partially applied as a decorator
"""
- @functools.partial(compose, unicode)
+ @functools.partial(compose, pycompat.text_type)
def mul(a, b):
return a * b
diff --git a/odoo/addons/base/tests/test_ir_actions.py b/odoo/addons/base/tests/test_ir_actions.py
index cb48752a960..a2663964f59 100644
--- a/odoo/addons/base/tests/test_ir_actions.py
+++ b/odoo/addons/base/tests/test_ir_actions.py
@@ -64,7 +64,7 @@ class TestServerActions(TestServerActionsBase):
# Test: ir_values created
ir_values = self.env['ir.values'].search([('name', '=', 'Run TestAction')])
self.assertEqual(len(ir_values), 1, 'ir_actions_server: create_action should have created an entry in ir_values')
- self.assertEqual(ir_values.value, 'ir.actions.server,%s' % self.action.id, 'ir_actions_server: created ir_values should reference the server action')
+ self.assertEqual(ir_values.value, b'ir.actions.server,%d' % self.action.id, 'ir_actions_server: created ir_values should reference the server action')
self.assertEqual(ir_values.model, 'res.partner', 'ir_actions_server: created ir_values should be linked to the action base model')
# Do: remove contextual action
diff --git a/odoo/addons/base/tests/test_ir_attachment.py b/odoo/addons/base/tests/test_ir_attachment.py
index 284d8c71da2..8c3769b1178 100644
--- a/odoo/addons/base/tests/test_ir_attachment.py
+++ b/odoo/addons/base/tests/test_ir_attachment.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
+import base64
import hashlib
import os
@@ -16,14 +16,14 @@ class TestIrAttachment(TransactionCase):
self.filestore = self.Attachment._filestore()
# Blob1
- self.blob1 = 'blob1'
- self.blob1_b64 = self.blob1.encode('base64')
+ self.blob1 = b'blob1'
+ self.blob1_b64 = base64.b64encode(self.blob1)
blob1_hash = hashlib.sha1(self.blob1).hexdigest()
self.blob1_fname = blob1_hash[:HASH_SPLIT] + '/' + blob1_hash
# Blob2
- self.blob2 = 'blob2'
- self.blob2_b64 = self.blob2.encode('base64')
+ self.blob2 = b'blob2'
+ self.blob2_b64 = base64.b64encode(self.blob2)
def test_01_store_in_db(self):
# force storing in database
diff --git a/odoo/addons/base/tests/test_ir_http.py b/odoo/addons/base/tests/test_ir_http.py
index ef50cdb5a3f..420a16004ce 100644
--- a/odoo/addons/base/tests/test_ir_http.py
+++ b/odoo/addons/base/tests/test_ir_http.py
@@ -3,7 +3,7 @@
from odoo.tests import common
import odoo
-GIF = "R0lGODdhAQABAIAAAP///////ywAAAAAAQABAAACAkQBADs="
+GIF = b"R0lGODdhAQABAIAAAP///////ywAAAAAAQABAAACAkQBADs="
class test_ir_http_mimetype(common.TransactionCase):
diff --git a/odoo/addons/base/tests/test_mail.py b/odoo/addons/base/tests/test_mail.py
index 1a30ef4690b..84cf892ea30 100644
--- a/odoo/addons/base/tests/test_mail.py
+++ b/odoo/addons/base/tests/test_mail.py
@@ -171,14 +171,14 @@ class TestSanitizer(unittest.TestCase):
for ext in test_mail_examples.QUOTE_BLOCKQUOTE_IN:
self.assertIn(ext, html)
for ext in test_mail_examples.QUOTE_BLOCKQUOTE_OUT:
- self.assertIn('%s' % misc.html_escape(ext.decode('utf-8')), html)
+ self.assertIn(u'%s' % misc.html_escape(ext), html)
def test_quote_thunderbird(self):
html = html_sanitize(test_mail_examples.QUOTE_THUNDERBIRD_1)
for ext in test_mail_examples.QUOTE_THUNDERBIRD_1_IN:
self.assertIn(ext, html)
for ext in test_mail_examples.QUOTE_THUNDERBIRD_1_OUT:
- self.assertIn('%s' % misc.html_escape(ext.decode('utf-8')), html)
+ self.assertIn(u'%s' % misc.html_escape(ext), html)
def test_quote_hotmail_html(self):
html = html_sanitize(test_mail_examples.QUOTE_HOTMAIL_HTML)
@@ -225,7 +225,7 @@ class TestSanitizer(unittest.TestCase):
for text in in_lst:
self.assertIn(text, new_html)
for text in out_lst:
- self.assertIn('%s' % misc.html_escape(text), new_html)
+ self.assertIn(u'%s' % misc.html_escape(text), new_html)
def test_quote_signature(self):
test_data = [
@@ -244,27 +244,27 @@ class TestSanitizer(unittest.TestCase):
for ext in test_mail_examples.GMAIL_1_IN:
self.assertIn(ext, html)
for ext in test_mail_examples.GMAIL_1_OUT:
- self.assertIn('%s' % misc.html_escape(ext), html)
+ self.assertIn(u'%s' % misc.html_escape(ext), html)
def test_quote_text(self):
html = html_sanitize(test_mail_examples.TEXT_1)
for ext in test_mail_examples.TEXT_1_IN:
self.assertIn(ext, html)
for ext in test_mail_examples.TEXT_1_OUT:
- self.assertIn('%s' % misc.html_escape(ext), html)
+ self.assertIn(u'%s' % misc.html_escape(ext), html)
html = html_sanitize(test_mail_examples.TEXT_2)
for ext in test_mail_examples.TEXT_2_IN:
self.assertIn(ext, html)
for ext in test_mail_examples.TEXT_2_OUT:
- self.assertIn('%s' % misc.html_escape(ext), html)
+ self.assertIn(u'%s' % misc.html_escape(ext), html)
def test_quote_bugs(self):
html = html_sanitize(test_mail_examples.BUG1)
for ext in test_mail_examples.BUG_1_IN:
self.assertIn(ext, html)
for ext in test_mail_examples.BUG_1_OUT:
- self.assertIn('%s' % misc.html_escape(ext.decode('utf-8')), html)
+ self.assertIn(u'%s' % misc.html_escape(ext), html)
def test_misc(self):
# False / void should not crash
diff --git a/odoo/addons/base/tests/test_mail_examples.py b/odoo/addons/base/tests/test_mail_examples.py
index dfecfe7c0d4..4f3b5b48300 100644
--- a/odoo/addons/base/tests/test_mail_examples.py
+++ b/odoo/addons/base/tests/test_mail_examples.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-MISC_HTML_SOURCE = """
+MISC_HTML_SOURCE = u"""
test1
test link """ -EDI_LIKE_HTML_SOURCE = """
\n') + return pycompat.to_text(string).replace(u'\n', u'
\n') def html_escape(string, options): """ Automatically escapes content unless options['html-escape'] @@ -88,7 +88,7 @@ class FieldConverter(models.AbstractModel): Converts a single value to its HTML version/output :rtype: unicode """ - return html_escape(unicodifier(value) or u'', options) + return html_escape(pycompat.to_text(value), options) @api.model def record_to_html(self, record, field_name, options): @@ -123,7 +123,7 @@ class IntegerConverter(models.AbstractModel): @api.model def value_to_html(self, value, options): - return unicodifier(self.user_lang().format('%d', value, grouping=True).replace(r'-', u'\u2011')) + return pycompat.to_text(self.user_lang().format('%d', value, grouping=True).replace(r'-', u'\u2011')) class FloatConverter(models.AbstractModel): @@ -152,7 +152,7 @@ class FloatConverter(models.AbstractModel): if precision is None: formatted = re.sub(r'(?:(0|\d+?)0+)$', r'\1', formatted) - return unicodifier(formatted) + return pycompat.to_text(formatted) @api.model def record_to_html(self, record, field_name, options): @@ -182,7 +182,7 @@ class DateTimeConverter(models.AbstractModel): lang = self.user_lang() locale = babel.Locale.parse(lang.code) - if isinstance(value, basestring): + if isinstance(value, pycompat.string_types): value = fields.Datetime.from_string(value) value = fields.Datetime.context_timestamp(self, value) @@ -200,7 +200,7 @@ class DateTimeConverter(models.AbstractModel): if options and options.get('hide_seconds'): pattern = pattern.replace(":ss", "").replace(":s", "") - return unicodifier(babel.dates.format_datetime(value, format=pattern, locale=locale)) + return pycompat.to_text(babel.dates.format_datetime(value, format=pattern, locale=locale)) class TextConverter(models.AbstractModel): @@ -223,7 +223,7 @@ class SelectionConverter(models.AbstractModel): def value_to_html(self, value, options): if not value: return '' - return html_escape(unicodifier(options['selection'][value]) or u'', options) + return html_escape(pycompat.to_text(options['selection'][value]) or u'', options) @api.model def record_to_html(self, record, field_name, options): @@ -252,7 +252,7 @@ class HTMLConverter(models.AbstractModel): @api.model def value_to_html(self, value, options): - return unicodifier(value) or u'' + return pycompat.to_text(value) class ImageConverter(models.AbstractModel): @@ -269,15 +269,15 @@ class ImageConverter(models.AbstractModel): @api.model def value_to_html(self, value, options): - try: - image = Image.open(BytesIO(value.decode('base64'))) + try: # FIXME: maaaaaybe it could also take raw bytes? + image = Image.open(BytesIO(base64.b64decode(value))) image.verify() except IOError: raise ValueError("Non-image binary fields can not be converted to HTML") except: # image.verify() throws "suitable exceptions", I have no idea what they are raise ValueError("Invalid image content") - return unicodifier('
test2
@@ -19,7 +19,7 @@ test12
test link """ -EDI_LIKE_HTML_SOURCE = """
+EDI_LIKE_HTML_SOURCE = u"""
Hello ${object.partner_id.name},
A new invoice is available for you:
@@ -63,7 +63,7 @@ EDI_LIKE_HTML_SOURCE = """
+QUOTE_BLOCKQUOTE = u"""
@@ -103,14 +103,14 @@ web: https://opener.am