[FIX] base_partner_merge PEP8

base_partner_merge/__openerp__.py

@@ -3,7 +3,9 @@
     'author': 'OpenERP S.A.',
     'category': 'Generic Modules/Base',
     'version': '0.1',
-    'description': """backport module, to be removed when we switch to saas2 on the private servers""",
+    'description': """
+backport module, to be removed when we switch to saas2 on the private servers
+""",
     'depends': [
         'base',
     ],

base_partner_merge/validate_email.py

@@ -46,32 +46,47 @@ WSP = r'[ \t]'                                                            # see
 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.)
+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
+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
+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
+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):
-
     """Indicate whether the given string is a valid email address
     according to the 'addr-spec' portion of RFC 2822 (see section
     3.4.1).  Parts of the spec that are marked obsolete are *not*
@@ -104,7 +119,8 @@ def validate_email(email, check_mx=False, verify=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
@@ -114,5 +130,6 @@ def validate_email(email, check_mx=False, verify=False):
 
 # 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 *