From c2b3905a87fee500a28e5da737e7060b8e56b8d4 Mon Sep 17 00:00:00 2001 From: manawi Date: Thu, 6 Oct 2016 17:31:30 +0500 Subject: [PATCH] [FIX] 8.0-travis-fix (#58) * [FIX] CamelCase * [FIX] Changing signs of the tabs to 4 spaces * [FIX] relative-import * [FIX] delete unused imports * [FIX] delete prints * [FIX] lint for js * [FIX] Duplicate implicit target name: "changelog" * [FIX] links in rst files * [FIX] flake8 E115 * [FIX] pylint E1124 * [FIX] pylint W1401 --- mail_all/README.rst | 4 ++-- mail_all/doc/changelog.rst | 4 ++-- mail_check_immediately/doc/changelog.rst | 4 ++-- .../mail_delete_access_link.py | 2 +- .../mail_delete_sent_by_footer.py | 2 +- mail_fix_553/mail_fix_553.py | 4 ++-- mail_fix_empty_body/models.py | 4 ++-- mail_move_message/doc/changelog.rst | 4 ++-- mail_move_message/mail_move_message_models.py | 18 +++++++++--------- mail_outgoing/mail_outgoing_models.py | 6 +++--- mail_partner_lang/models.py | 2 +- mail_private/README.rst | 6 +++--- mail_private/__init__.py | 2 +- mail_private/doc/changelog.rst | 4 ++-- mail_private/models.py | 4 +--- mail_private/static/src/js/mail_private.js | 10 +++++----- mail_private/static/src/xml/mail_private.xml | 8 ++++---- mail_recovery/README.rst | 6 +++--- mail_recovery/doc/changelog.rst | 4 ++-- mail_sent/doc/changelog.rst | 4 ++-- mail_sent/models.py | 8 ++++---- mail_wall_menu/static/lib/masonry.pkgd.min.js | 2 +- mail_wall_menu/static/src/js/mail_wall_menu.js | 8 ++++---- mail_wall_widgets/models.py | 8 ++++---- res_partner_mails_count/models.py | 2 +- res_partner_mails_count/tests/test_phantom.py | 4 ++-- res_partner_strip_email/models.py | 6 +++--- 27 files changed, 69 insertions(+), 71 deletions(-) diff --git a/mail_all/README.rst b/mail_all/README.rst index db6304b..4658967 100644 --- a/mail_all/README.rst +++ b/mail_all/README.rst @@ -9,8 +9,8 @@ Further information HTML Description: https://apps.odoo.com/apps/modules/8.0/mail_all/ -Usage instructions: ``__ +Usage instructions: ``___ -Changelog: ``__ +Changelog: ``___ Tested on Odoo 8.0 0af32f3f84bae07b11abb8538d02e35c7369a348 diff --git a/mail_all/doc/changelog.rst b/mail_all/doc/changelog.rst index e2b0277..5f35720 100644 --- a/mail_all/doc/changelog.rst +++ b/mail_all/doc/changelog.rst @@ -1,5 +1,5 @@ -Changelog -========= +Updates +======= `1.0.0` ------- diff --git a/mail_check_immediately/doc/changelog.rst b/mail_check_immediately/doc/changelog.rst index e72d492..013b693 100644 --- a/mail_check_immediately/doc/changelog.rst +++ b/mail_check_immediately/doc/changelog.rst @@ -1,7 +1,7 @@ .. _changelog: -Changelog -========= +Updates +======= `1.0.1` ------- diff --git a/mail_delete_access_link/mail_delete_access_link.py b/mail_delete_access_link/mail_delete_access_link.py index f070988..74d849b 100644 --- a/mail_delete_access_link/mail_delete_access_link.py +++ b/mail_delete_access_link/mail_delete_access_link.py @@ -2,7 +2,7 @@ from openerp.osv import osv -class mail_mail(osv.Model): +class MailMail(osv.Model): _inherit = 'mail.mail' def _get_partner_access_link(self, cr, uid, mail, partner=None, context=None): diff --git a/mail_delete_sent_by_footer/mail_delete_sent_by_footer.py b/mail_delete_sent_by_footer/mail_delete_sent_by_footer.py index cde3c93..72c0117 100644 --- a/mail_delete_sent_by_footer/mail_delete_sent_by_footer.py +++ b/mail_delete_sent_by_footer/mail_delete_sent_by_footer.py @@ -3,7 +3,7 @@ from openerp.osv import osv from openerp import tools, SUPERUSER_ID -class mail_notification(osv.Model): +class MailNotification(osv.Model): _inherit = 'mail.notification' def get_signature_footer(self, cr, uid, user_id, res_model=None, res_id=None, context=None, user_signature=True): diff --git a/mail_fix_553/mail_fix_553.py b/mail_fix_553/mail_fix_553.py index 7352fd0..003af81 100644 --- a/mail_fix_553/mail_fix_553.py +++ b/mail_fix_553/mail_fix_553.py @@ -15,7 +15,7 @@ from openerp.tools.translate import _ _logger = logging.getLogger(__name__) -class mail_mail(osv.Model): +class MailMail(osv.Model): _inherit = "mail.mail" def send(self, cr, uid, ids, auto_commit=False, raise_exception=False, context=None): @@ -40,7 +40,7 @@ class mail_mail(osv.Model): catchall_alias_name = self.pool['ir.config_parameter'].get_param(cr, uid, "mail.catchall.name_alias_from", context=context) catchall_domain = self.pool['ir.config_parameter'].get_param(cr, uid, "mail.catchall.domain", context=context) - correct_email_from = '@%s>?\s*$' % catchall_domain + correct_email_from = r'@%s>?\s*$' % catchall_domain default_email_from = '%s@%s' % (catchall_alias, catchall_domain) context = dict(context or {}) diff --git a/mail_fix_empty_body/models.py b/mail_fix_empty_body/models.py index 4852923..cf622d3 100644 --- a/mail_fix_empty_body/models.py +++ b/mail_fix_empty_body/models.py @@ -2,11 +2,11 @@ from openerp import models -class mail_compose_message(models.TransientModel): +class MailComposeMessage(models.TransientModel): _inherit = 'mail.compose.message' def get_mail_values(self, cr, uid, wizard, res_ids, context=None): - res = super(mail_compose_message, self).get_mail_values(cr, uid, wizard, res_ids, context) + res = super(MailComposeMessage, self).get_mail_values(cr, uid, wizard, res_ids, context) for id, d in res.iteritems(): d['body'] = d.get('body') or '' return res diff --git a/mail_move_message/doc/changelog.rst b/mail_move_message/doc/changelog.rst index 4704b1f..2f27ae2 100644 --- a/mail_move_message/doc/changelog.rst +++ b/mail_move_message/doc/changelog.rst @@ -1,7 +1,7 @@ .. _changelog: -Changelog -========= +Updates +======= `1.0.4` ------- diff --git a/mail_move_message/mail_move_message_models.py b/mail_move_message/mail_move_message_models.py index dc66b74..912d88e 100644 --- a/mail_move_message/mail_move_message_models.py +++ b/mail_move_message/mail_move_message_models.py @@ -4,7 +4,7 @@ from openerp.tools import email_split from openerp.tools.translate import _ -class wizard(models.TransientModel): +class Wizard(models.TransientModel): _name = 'mail_move_message.wizard' def _model_selection(self): @@ -26,7 +26,7 @@ class wizard(models.TransientModel): @api.model def default_get(self, fields_list): - res = super(wizard, self).default_get(fields_list) + res = super(Wizard, self).default_get(fields_list) model_fields = self.fields_get() if model_fields['model']['selection']: @@ -231,7 +231,7 @@ class wizard(models.TransientModel): return {'type': 'ir.actions.act_window_close'} -class mail_message(models.Model): +class MailMessage(models.Model): _inherit = 'mail.message' is_moved = fields.Boolean('Is moved') @@ -300,7 +300,7 @@ class mail_message(models.Model): r_vals['parent_id'] = r.moved_from_parent_id.id r_vals['res_id'] = r.moved_from_res_id r_vals['model'] = r.moved_from_model - print 'update message', r, r_vals + # print 'update message', r, r_vals if move_followers: r.sudo().move_followers(r_vals.get('model'), r_vals.get('res_id')) r.sudo().write(r_vals) @@ -311,7 +311,7 @@ class mail_message(models.Model): def name_get(self, cr, uid, ids, context=None): if not (context or {}).get('extended_name'): - return super(mail_message, self).name_get(cr, uid, ids, context=context) + return super(MailMessage, self).name_get(cr, uid, ids, context=context) if isinstance(ids, (list, tuple)) and not len(ids): return [] if isinstance(ids, (long, int)): @@ -325,12 +325,12 @@ class mail_message(models.Model): return res def _message_read_dict(self, cr, uid, message, parent_id=False, context=None): - res = super(mail_message, self)._message_read_dict(cr, uid, message, parent_id, context) + res = super(MailMessage, self)._message_read_dict(cr, uid, message, parent_id, context) res['is_moved'] = message.is_moved return res -class mail_move_message_configuration(models.TransientModel): +class MailMoveMessageConfiguration(models.TransientModel): _name = 'mail_move_message.config.settings' _inherit = 'res.config.settings' @@ -361,12 +361,12 @@ class mail_move_message_configuration(models.TransientModel): config_parameters.set_param('mail_relocation_move_followers', record.move_followers or '') -class res_partner(models.Model): +class ResPartner(models.Model): _inherit = 'res.partner' @api.model def create(self, vals): - res = super(res_partner, self).create(vals) + res = super(ResPartner, self).create(vals) if 'update_message_author' in self.env.context and 'email' in vals: mail_message_obj = self.env['mail.message'] # Escape special SQL characters in email_address to avoid invalid matches diff --git a/mail_outgoing/mail_outgoing_models.py b/mail_outgoing/mail_outgoing_models.py index 2a232dd..cd358d6 100644 --- a/mail_outgoing/mail_outgoing_models.py +++ b/mail_outgoing/mail_outgoing_models.py @@ -2,7 +2,7 @@ from openerp.osv import osv -class mail_message(osv.Model): +class MailMessage(osv.Model): _inherit = 'mail.message' def check_access_rule(self, cr, uid, ids, operation, context=None): @@ -13,10 +13,10 @@ class mail_message(osv.Model): if user_groups.issuperset(group_all_emails): return - return super(mail_message, self).check_access_rule(cr, uid, ids, operation, context) + return super(MailMessage, self).check_access_rule(cr, uid, ids, operation, context) -class mail_mail(osv.Model): +class MailMail(osv.Model): _name = 'mail.mail' _inherit = ['mail.mail', 'ir.needaction_mixin'] _needaction = True diff --git a/mail_partner_lang/models.py b/mail_partner_lang/models.py index ca95d19..d4e37a2 100644 --- a/mail_partner_lang/models.py +++ b/mail_partner_lang/models.py @@ -2,7 +2,7 @@ from openerp.osv import osv -class mail_thread(osv.Model): +class MailThread(osv.Model): _inherit = "mail.thread" def message_track(self, cr, uid, ids, tracked_fields, initial_values, context={}): diff --git a/mail_private/README.rst b/mail_private/README.rst index b1752d6..6a9fc15 100644 --- a/mail_private/README.rst +++ b/mail_private/README.rst @@ -13,7 +13,7 @@ Contributors Sponsors -------- -* `IT-Projects LLC `_ +* `IT-Projects LLC `__ Further information =================== @@ -22,8 +22,8 @@ Demo: http://runbot.it-projects.info/demo/mail-addons/8.0 HTML Description: https://apps.odoo.com/apps/modules/8.0/mail_private/ -Usage instructions: ``_ +Usage instructions: ``__ -Changelog: ``_ +Changelog: ``__ Tested on Odoo 8.0 0af32f3f84bae07b11abb8538d02e35c7369a348 diff --git a/mail_private/__init__.py b/mail_private/__init__.py index c7b5ac7..cde864b 100644 --- a/mail_private/__init__.py +++ b/mail_private/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -import models +from . import models diff --git a/mail_private/doc/changelog.rst b/mail_private/doc/changelog.rst index e2b0277..5f35720 100644 --- a/mail_private/doc/changelog.rst +++ b/mail_private/doc/changelog.rst @@ -1,5 +1,5 @@ -Changelog -========= +Updates +======= `1.0.0` ------- diff --git a/mail_private/models.py b/mail_private/models.py index ce69730..2d4b7ef 100644 --- a/mail_private/models.py +++ b/mail_private/models.py @@ -1,11 +1,9 @@ # -*- coding: utf-8 -*- -from openerp import api from openerp.osv import osv, fields -from openerp import SUPERUSER_ID -class mail_compose_message(osv.TransientModel): +class MailComposeMessage(osv.TransientModel): _inherit = 'mail.compose.message' _columns = { diff --git a/mail_private/static/src/js/mail_private.js b/mail_private/static/src/js/mail_private.js index 2720516..bc0d781 100644 --- a/mail_private/static/src/js/mail_private.js +++ b/mail_private/static/src/js/mail_private.js @@ -52,7 +52,7 @@ openerp.mail_private = function(instance){ }; self.do_action(action, { - 'on_close': function(){ !self.parent_thread.options.view_inbox && self.parent_thread.message_fetch() } + 'on_close': function(){ !self.parent_thread.options.view_inbox && self.parent_thread.message_fetch(); } }); self.on_cancel(); }); @@ -75,10 +75,10 @@ openerp.mail_private = function(instance){ 'content_subtype': 'plaintext', }; if (log || self.private) { - values['subtype'] = false; + values.subtype = false; } else { - values['subtype'] = 'mail.mt_comment'; + values.subtype = 'mail.mt_comment'; } this.parent_thread.ds_thread._model.call('message_post', [this.context.default_res_id], values).done(function (message_id) { var thread = self.parent_thread; @@ -128,7 +128,7 @@ openerp.mail_private = function(instance){ 'name': parsed_email[0], 'email_address': parsed_email[1], 'reason': recipient[2], - }) + }); } }); }); @@ -141,7 +141,7 @@ openerp.mail_private = function(instance){ if (!r.partner_id){ r.checked = false; } - }) + }); // when call for suggested partners finished: re-render the widget $.when(suggested_partners).pipe(function (additional_recipients) { diff --git a/mail_private/static/src/xml/mail_private.xml b/mail_private/static/src/xml/mail_private.xml index e2d8971..d603d82 100644 --- a/mail_private/static/src/xml/mail_private.xml +++ b/mail_private/static/src/xml/mail_private.xml @@ -1,10 +1,10 @@