Fix pep8

base_partner_merge/base_partner_merge.py

@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
 from __future__ import absolute_import
 from email.utils import parseaddr
 import functools
@@ -14,7 +15,7 @@ from openerp.tools import mute_logger
 from .validate_email import validate_email
 
 import openerp
-from openerp.osv import osv, orm
+from openerp.osv import orm
 from openerp.osv import fields
 from openerp.osv.orm import browse_record
 from openerp.tools.translate import _
@@ -55,7 +56,7 @@ def is_integer_list(ids):
     return all(isinstance(i, (int, long)) for i in ids)
 
 
-class ResPartner(osv.Model):
+class ResPartner(orm.Model):
     _inherit = 'res.partner'
 
     _columns = {
@@ -64,7 +65,7 @@ class ResPartner(osv.Model):
     }
 
 
-class MergePartnerLine(osv.TransientModel):
+class MergePartnerLine(orm.TransientModel):
     _name = 'base.partner.merge.line'
 
     _columns = {
@@ -77,7 +78,7 @@ class MergePartnerLine(osv.TransientModel):
     _order = 'min_id asc'
 
 
-class MergePartnerAutomatic(osv.TransientModel):
+class MergePartnerAutomatic(orm.TransientModel):
     """
     The idea behind this wizard is to create a list of potential partners to
     merge. We use two objects, the first one is the wizard for the end-user.
@@ -326,7 +327,7 @@ class MergePartnerAutomatic(osv.TransientModel):
         if parent_id and parent_id != dst_partner.id:
             try:
                 dst_partner.write({'parent_id': parent_id})
-            except (osv.except_osv, orm.except_orm):
+            except (orm.except_orm, orm.except_orm):
                 _logger.info('Skip recursive partner hierarchies for '
                              'parent_id %s of partner: %s',
                              parent_id, dst_partner.id)
@@ -341,7 +342,7 @@ class MergePartnerAutomatic(osv.TransientModel):
             return
 
         if len(partner_ids) > 3:
-            raise osv.except_osv(
+            raise orm.except_orm(
                 _('Error'),
                 _("For safety reasons, you cannot merge more than 3 contacts "
                   "together. You can re-open the wizard several times if "
@@ -351,7 +352,7 @@ class MergePartnerAutomatic(osv.TransientModel):
                 and len(set(partner.email for partner
                             in proxy.browse(cr, uid, partner_ids,
                                             context=context))) > 1):
-            raise osv.except_osv(
+            raise orm.except_orm(
                 _('Error'),
                 _("All contacts must have the same email. Only the "
                   "Administrator can merge contacts with different emails."))
@@ -378,7 +379,7 @@ class MergePartnerAutomatic(osv.TransientModel):
                                              [partner.id for partner
                                               in src_partners])],
                                            context=context)):
-            raise osv.except_osv(
+            raise orm.except_orm(
                 _('Error'),
                 _("Only the destination contact may be linked to existing "
                   "Journal Items. Please ask the Administrator if you need to"
@@ -399,8 +400,12 @@ class MergePartnerAutomatic(osv.TransientModel):
         dst_partner.message_post(
             body='%s %s' % (
                 _("Merged with the following partners:"),
-                ", ".join('%s<%s>(ID %s)' % (p.name, p.email or 'n/a', p.id)
-                                             for p in src_partners)))
+                ", ".join(
+                    '%s<%s>(ID %s)' % (p.name, p.email or 'n/a', p.id)
+                    for p in src_partners
+                )
+            )
+        )
 
         for partner in src_partners:
             partner.unlink()
@@ -513,7 +518,7 @@ class MergePartnerAutomatic(osv.TransientModel):
         ]
 
         if not groups:
-            raise osv.except_osv(_('Error'),
+            raise orm.except_orm(_('Error'),
                                  _("You have to specify a filter for your "
                                    "selection"))
 
@@ -555,7 +560,7 @@ class MergePartnerAutomatic(osv.TransientModel):
                     cr, uid,
                     current_partner_ids,
                     context
-                    )[-1].id,
+                )[-1].id,
                 'state': 'selection',
             })
         else:

base_partner_merge/validate_email.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # RFC 2822 - style email validation for Python
 # (c) 2012 Syrus Akbary <me@syrusakbary.com>
 # Extended from (c) 2011 Noel Bush <noel@aitools.org>
@@ -19,14 +20,15 @@
 
 import re
 import smtplib
-import socket
 
 try:
     import DNS
     ServerError = DNS.ServerError
 except:
     DNS = None
-    class ServerError(Exception): pass
+
+    class ServerError(Exception):
+        pass
 # All we are really doing is comparing the input string to one
 # gigantic regular expression.  But building that regexp, and
 # ensuring its correctness, is made much easier by assembling it
@@ -40,48 +42,35 @@ except:
 # even when it's not strictly necessary.  This way we don't forget
 # when it is necessary.)
 #
-WSP = r'[ \t]'                                       # see 2.2.2. Structured Header Field Bodies
-CRLF = r'(?:\r\n)'                                   # see 2.2.3. Long Header Fields
-NO_WS_CTL = r'\x01-\x08\x0b\x0c\x0f-\x1f\x7f'        # see 3.2.1. Primitive Tokens
-QUOTED_PAIR = r'(?:\\.)'                             # see 3.2.2. Quoted characters
-FWS = r'(?:(?:' + WSP + r'*' + CRLF + r')?' + \
-            WSP + r'+)'                                    # see 3.2.3. Folding white space and comments
-CTEXT = r'[' + NO_WS_CTL + \
-                r'\x21-\x27\x2a-\x5b\x5d-\x7e]'              # see 3.2.3
-CCONTENT = r'(?:' + CTEXT + r'|' + \
-                     QUOTED_PAIR + r')'                        # see 3.2.3 (NB: The RFC includes COMMENT here
-                                                                                                         # as well, but that would be circular.)
-COMMENT = r'\((?:' + FWS + r'?' + CCONTENT + \
-                    r')*' + FWS + r'?\)'                       # see 3.2.3
-CFWS = r'(?:' + FWS + r'?' + COMMENT + ')*(?:' + \
-             FWS + '?' + COMMENT + '|' + FWS + ')'         # see 3.2.3
-ATEXT = r'[\w!#$%&\'\*\+\-/=\?\^`\{\|\}~]'           # see 3.2.4. Atom
-ATOM = CFWS + r'?' + ATEXT + r'+' + CFWS + r'?'      # see 3.2.4
-DOT_ATOM_TEXT = ATEXT + r'+(?:\.' + ATEXT + r'+)*'   # see 3.2.4
-DOT_ATOM = CFWS + r'?' + DOT_ATOM_TEXT + CFWS + r'?' # see 3.2.4
-QTEXT = r'[' + NO_WS_CTL + \
-                r'\x21\x23-\x5b\x5d-\x7e]'                   # see 3.2.5. Quoted strings
-QCONTENT = r'(?:' + QTEXT + r'|' + \
-                     QUOTED_PAIR + r')'                        # see 3.2.5
-QUOTED_STRING = CFWS + r'?' + r'"(?:' + FWS + \
-                                r'?' + QCONTENT + r')*' + FWS + \
-                                r'?' + r'"' + CFWS + r'?'
-LOCAL_PART = r'(?:' + DOT_ATOM + r'|' + \
-                         QUOTED_STRING + r')'                    # see 3.4.1. Addr-spec specification
-DTEXT = r'[' + NO_WS_CTL + r'\x21-\x5a\x5e-\x7e]'    # see 3.4.1
-DCONTENT = r'(?:' + DTEXT + r'|' + \
-                     QUOTED_PAIR + r')'                        # see 3.4.1
-DOMAIN_LITERAL = CFWS + r'?' + r'\[' + \
-                                 r'(?:' + FWS + r'?' + DCONTENT + \
-                                 r')*' + FWS + r'?\]' + CFWS + r'?'  # see 3.4.1
-DOMAIN = r'(?:' + DOT_ATOM + r'|' + \
-                 DOMAIN_LITERAL + r')'                       # see 3.4.1
-ADDR_SPEC = LOCAL_PART + r'@' + DOMAIN               # see 3.4.1
+WSP = r'[ \t]'                                                            # see 2.2.2. Structured Header Field Bodies
+CRLF = r'(?:\r\n)'                                                        # see 2.2.3. Long Header Fields
+NO_WS_CTL = r'\x01-\x08\x0b\x0c\x0f-\x1f\x7f'                             # see 3.2.1. Primitive Tokens
+QUOTED_PAIR = r'(?:\\.)'                                                  # see 3.2.2. Quoted characters
+FWS = r'(?:(?:{0}*{1})?{0}+)'.format(WSP, CRLF)                           # see 3.2.3. Folding white space and comments
+CTEXT = r'[{0}\x21-\x27\x2a-\x5b\x5d-\x7e]'.format(NO_WS_CTL)             # see 3.2.3
+# see 3.2.3 (NB: The RFC includes COMMENT here as well, but that would be circular.)
+CCONTENT = r'(?:{0}|{1})'.format(CTEXT, QUOTED_PAIR)
+COMMENT = r'\((?:{0}?{1})*{0}?\)'.format(FWS, CCONTENT)                   # see 3.2.3
+CFWS = r'(?:{0}?{1})*(?:{0}?{1}|{0})'.format(FWS, COMMENT)                # see 3.2.3
+ATEXT = r'[\w!#$%&\'\*\+\-/=\?\^`\{\|\}~]'                                # see 3.2.4. Atom
+ATOM = r'{0}?{1}+{0}?'.format(CFWS, ATEXT)                                # see 3.2.4
+DOT_ATOM_TEXT = r'{0}+(?:\.{0}+)*'.format(ATEXT)                          # see 3.2.4
+DOT_ATOM = r'{0}?{1}{0}?'.format(CFWS, DOT_ATOM_TEXT)                     # see 3.2.4
+QTEXT = r'[{0}\x21\x23-\x5b\x5d-\x7e]'.format(NO_WS_CTL)                  # see 3.2.5. Quoted strings
+QCONTENT = r'(?:{0}|{1})'.format(QTEXT, QUOTED_PAIR)                      # see 3.2.5
+QUOTED_STRING = r'{0}?"(?:{1}?{2})*{1}?"{0}?'.format(CFWS, FWS, QCONTENT)
+LOCAL_PART = r'(?:{0}|{1})'.format(DOT_ATOM, QUOTED_STRING)               # see 3.4.1. Addr-spec specification
+DTEXT = r'[{0}\x21-\x5a\x5e-\x7e]'.format(NO_WS_CTL)                      # see 3.4.1
+DCONTENT = r'(?:{0}|{1})'.format(DTEXT, QUOTED_PAIR)                      # see 3.4.1
+DOMAIN_LITERAL = r'{0}?\[(?:{1}?{2})*{1}?\]{0}?'.format(CFWS, FWS, DCONTENT)  # see 3.4.1
+DOMAIN = r'(?:{0}|{1})'.format(DOT_ATOM, DOMAIN_LITERAL)                  # see 3.4.1
+ADDR_SPEC = r'{0}@{1}'.format(LOCAL_PART, DOMAIN)                         # see 3.4.1
 
 # A valid address will match exactly the 3.4.1 addr-spec.
 VALID_ADDRESS_REGEXP = '^' + ADDR_SPEC + '$'
 
-def validate_email(email, check_mx=False,verify=False):
+
+def validate_email(email, check_mx=False, verify=False):
 
     """Indicate whether the given string is a valid email address
     according to the 'addr-spec' portion of RFC 2822 (see section
@@ -94,30 +83,36 @@ def validate_email(email, check_mx=False,verify=False):
         assert re.match(VALID_ADDRESS_REGEXP, email) is not None
         check_mx |= verify
         if check_mx:
-            if not DNS: raise Exception('For check the mx records or check if the email exists you must have installed pyDNS python package')
+            if not DNS:
+                raise Exception('For check the mx records or check if the '
+                                'email exists you must have installed pyDNS '
+                                'python package')
             DNS.DiscoverNameServers()
-            hostname = email[email.find('@')+1:]
+            hostname = email[email.find('@') + 1:]
             mx_hosts = DNS.mxlookup(hostname)
             for mx in mx_hosts:
                 try:
                     smtp = smtplib.SMTP()
                     smtp.connect(mx[1])
-                    if not verify: return True
+                    if not verify:
+                        return True
                     status, _ = smtp.helo()
-                    if status != 250: continue
+                    if status != 250:
+                        continue
                     smtp.mail('')
                     status, _ = smtp.rcpt(email)
-                    if status != 250: return False
+                    if status != 250:
+                        return False
                     break
-                except smtplib.SMTPServerDisconnected: #Server not permits verify user
+                except smtplib.SMTPServerDisconnected:  # Server not permits verify user
                     break
                 except smtplib.SMTPConnectError:
                     continue
-    except (AssertionError, ServerError): 
+    except (AssertionError, ServerError):
         return False
     return True
 
 # import sys
 
-# sys.modules[__name__],sys.modules['validate_email_module'] = validate_email,sys.modules[__name__]
+# sys.modules[__name__], sys.modules['validate_email_module'] = validate_email, sys.modules[__name__]
 # from validate_email_module import *