mirror of
https://github.com/NaN-tic/trytond-electronic_mail-old-ts.git
synced 2023-12-14 02:03:04 +01:00
Migrate to py3
This commit is contained in:
parent
7dc780a80f
commit
d31c38abcd
7 changed files with 14 additions and 21 deletions
|
@ -8,8 +8,7 @@ from trytond import backend
|
||||||
__all__ = ['ActionReport', 'ActionWizard']
|
__all__ = ['ActionReport', 'ActionWizard']
|
||||||
|
|
||||||
|
|
||||||
class ActionReport:
|
class ActionReport(metaclass=PoolMeta):
|
||||||
__metaclass__ = PoolMeta
|
|
||||||
__name__ = 'ir.action.report'
|
__name__ = 'ir.action.report'
|
||||||
email_filename = fields.Char('Email File Name', translate=True,
|
email_filename = fields.Char('Email File Name', translate=True,
|
||||||
help='File name e-mail attachment without extension. '
|
help='File name e-mail attachment without extension. '
|
||||||
|
@ -28,7 +27,6 @@ class ActionReport:
|
||||||
super(ActionReport, cls).__register__(module_name)
|
super(ActionReport, cls).__register__(module_name)
|
||||||
|
|
||||||
|
|
||||||
class ActionWizard:
|
class ActionWizard(metaclass=PoolMeta):
|
||||||
__metaclass__ = PoolMeta
|
|
||||||
__name__ = 'ir.action.wizard'
|
__name__ = 'ir.action.wizard'
|
||||||
template = fields.One2Many("electronic.mail.template", 'wizard', 'Template')
|
template = fields.One2Many("electronic.mail.template", 'wizard', 'Template')
|
||||||
|
|
|
@ -7,8 +7,7 @@ from trytond import backend
|
||||||
__all__ = ['Activity']
|
__all__ = ['Activity']
|
||||||
|
|
||||||
|
|
||||||
class Activity:
|
class Activity(metaclass=PoolMeta):
|
||||||
__metaclass__ = PoolMeta
|
|
||||||
__name__ = "activity.activity"
|
__name__ = "activity.activity"
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|
3
setup.py
3
setup.py
|
@ -7,10 +7,7 @@ from setuptools import setup
|
||||||
import re
|
import re
|
||||||
import os
|
import os
|
||||||
import io
|
import io
|
||||||
try:
|
|
||||||
from configparser import ConfigParser
|
from configparser import ConfigParser
|
||||||
except ImportError:
|
|
||||||
from ConfigParser import ConfigParser
|
|
||||||
|
|
||||||
MODULE = 'electronic_mail'
|
MODULE = 'electronic_mail'
|
||||||
PREFIX = 'trytonspain'
|
PREFIX = 'trytonspain'
|
||||||
|
|
15
template.py
15
template.py
|
@ -13,11 +13,12 @@ from trytond.sendmail import SMTPDataManager, sendmail_transactional, sendmail
|
||||||
from genshi.template import TextTemplate
|
from genshi.template import TextTemplate
|
||||||
from jinja2 import Template as Jinja2Template
|
from jinja2 import Template as Jinja2Template
|
||||||
from emailvalid import check_email
|
from emailvalid import check_email
|
||||||
from email import Encoders, charset
|
from email import charset
|
||||||
from email.header import decode_header, Header
|
from email.header import decode_header, Header
|
||||||
from email.mime.multipart import MIMEMultipart
|
from email.mime.multipart import MIMEMultipart
|
||||||
from email.mime.text import MIMEText
|
from email.mime.text import MIMEText
|
||||||
from email.mime.base import MIMEBase
|
from email.mime.base import MIMEBase
|
||||||
|
from email.encoders import encode_base64
|
||||||
from email.utils import formatdate, make_msgid
|
from email.utils import formatdate, make_msgid
|
||||||
|
|
||||||
__all__ = ['Template', 'TemplateReport', 'SendTemplateStart', 'SendTemplate']
|
__all__ = ['Template', 'TemplateReport', 'SendTemplateStart', 'SendTemplate']
|
||||||
|
@ -130,7 +131,7 @@ class Template(ModelSQL, ModelView):
|
||||||
'''Evaluate the pythonic expression and return its value
|
'''Evaluate the pythonic expression and return its value
|
||||||
'''
|
'''
|
||||||
if expression is None:
|
if expression is None:
|
||||||
return u''
|
return ''
|
||||||
|
|
||||||
assert record is not None, 'Record is undefined'
|
assert record is not None, 'Record is undefined'
|
||||||
template_context = cls.template_context(record)
|
template_context = cls.template_context(record)
|
||||||
|
@ -143,7 +144,7 @@ class Template(ModelSQL, ModelView):
|
||||||
:param record: Browse record
|
:param record: Browse record
|
||||||
'''
|
'''
|
||||||
if not expression:
|
if not expression:
|
||||||
return u''
|
return ''
|
||||||
|
|
||||||
template = TextTemplate(expression)
|
template = TextTemplate(expression)
|
||||||
template_context = cls.template_context(record)
|
template_context = cls.template_context(record)
|
||||||
|
@ -156,7 +157,7 @@ class Template(ModelSQL, ModelView):
|
||||||
:param record: Browse record
|
:param record: Browse record
|
||||||
'''
|
'''
|
||||||
if not expression:
|
if not expression:
|
||||||
return u''
|
return ''
|
||||||
|
|
||||||
template = Jinja2Template(expression)
|
template = Jinja2Template(expression)
|
||||||
template_context = cls.template_context(record)
|
template_context = cls.template_context(record)
|
||||||
|
@ -294,7 +295,7 @@ class Template(ModelSQL, ModelView):
|
||||||
vals = []
|
vals = []
|
||||||
for record in records:
|
for record in records:
|
||||||
val = {}
|
val = {}
|
||||||
for k, v in data.iteritems():
|
for k, v in data.items():
|
||||||
value = cls.eval(v, record, engine)
|
value = cls.eval(v, record, engine)
|
||||||
if k in ['from_', 'sender', 'to', 'cc', 'bcc']:
|
if k in ['from_', 'sender', 'to', 'cc', 'bcc']:
|
||||||
value = value.replace(' ', '').replace(',', ';')
|
value = value.replace(' ', '').replace(',', ';')
|
||||||
|
@ -408,7 +409,7 @@ class Template(ModelSQL, ModelView):
|
||||||
|
|
||||||
attachment = MIMEBase(maintype, subtype)
|
attachment = MIMEBase(maintype, subtype)
|
||||||
attachment.set_payload(data)
|
attachment.set_payload(data)
|
||||||
Encoders.encode_base64(attachment)
|
encode_base64(attachment)
|
||||||
attachment.add_header(
|
attachment.add_header(
|
||||||
'Content-Disposition', 'attachment', filename=filename)
|
'Content-Disposition', 'attachment', filename=filename)
|
||||||
message.attach(attachment)
|
message.attach(attachment)
|
||||||
|
@ -494,7 +495,7 @@ class SendTemplate(Wizard):
|
||||||
default = {}
|
default = {}
|
||||||
default['template'] = template.id
|
default['template'] = template.id
|
||||||
default['total'] = total
|
default['total'] = total
|
||||||
for k, v in template.pre_render(records)[0].iteritems():
|
for k, v in template.pre_render(records)[0].items():
|
||||||
default[k] = v
|
default[k] = v
|
||||||
return default
|
return default
|
||||||
|
|
||||||
|
|
0
tools.py
0
tools.py
|
@ -8,8 +8,7 @@ from trytond.pool import Pool, PoolMeta
|
||||||
__all__ = ['Trigger']
|
__all__ = ['Trigger']
|
||||||
|
|
||||||
|
|
||||||
class Trigger:
|
class Trigger(metaclass=PoolMeta):
|
||||||
__metaclass__ = PoolMeta
|
|
||||||
__name__ = 'ir.trigger'
|
__name__ = 'ir.trigger'
|
||||||
email_template = fields.Many2One('electronic.mail.template', 'Template')
|
email_template = fields.Many2One('electronic.mail.template', 'Template')
|
||||||
|
|
||||||
|
|
3
user.py
3
user.py
|
@ -7,8 +7,7 @@ from trytond.model import fields
|
||||||
__all__ = ['User']
|
__all__ = ['User']
|
||||||
|
|
||||||
|
|
||||||
class User:
|
class User(metaclass=PoolMeta):
|
||||||
__metaclass__ = PoolMeta
|
|
||||||
__name__ = "res.user"
|
__name__ = "res.user"
|
||||||
signature_html = fields.Text('Signature HTML')
|
signature_html = fields.Text('Signature HTML')
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue