Merge pull request #350 from yozachar/workshop

yozachar · web-flow · commit 29e8f01b7fd1 · 2024-04-02T15:55:10.000+05:30
patch: supported extended latin in username
diff --git a/src/validators/email.py b/src/validators/email.py
@@ -84,10 +84,12 @@ def email(
             )
         )
         if re.match(
+            # extended latin
+            r"(^[\u0100-\u017F\u0180-\u024F]"
             # dot-atom
-            r"(^[-!#$%&'*+/=?^_`{}|~0-9a-z]+(\.[-!#$%&'*+/=?^_`{}|~0-9a-z]+)*$"
+            + r"|[-!#$%&'*+/=?^_`{}|~0-9a-z]+(\.[-!#$%&'*+/=?^_`{}|~0-9a-z]+)*$"
             # quoted-string
-            + r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"$)',
+            + r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\011.])*"$)',
             username_part,
             re.IGNORECASE,
         )
diff --git a/src/validators/url.py b/src/validators/url.py
@@ -13,10 +13,12 @@
 @lru_cache
 def _username_regex():
     return re.compile(
+        # extended latin
+        r"(^[\u0100-\u017F\u0180-\u024F]"
         # dot-atom
-        r"(^[-!#$%&'*+/=?^_`{}|~0-9a-z]+(\.[-!#$%&'*+/=?^_`{}|~0-9a-z]+)*$"
+        + r"|[-!#$%&'*+/=?^_`{}|~0-9a-z]+(\.[-!#$%&'*+/=?^_`{}|~0-9a-z]+)*$"
         # non-quoted-string
-        + r"|^([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*$)",
+        + r"|^([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\011.])*$)",
         re.IGNORECASE,
     )
 
diff --git a/tests/test_email.py b/tests/test_email.py
@@ -17,6 +17,8 @@
         ("example@valid-with-hyphens.com",),
         ("test@domain.with.idn.tld.उदाहरण.परीक्षा",),
         ("email@localhost.in",),
+        ("Łókaść@email.com",),
+        ("łemłail@here.com",),
         ("email@localdomain.org",),
         ('"\\\011"@here.com',),
     ],

Original file line number	Diff line number	Diff line change
`@@ -84,10 +84,12 @@ def email(`
`84`	`84`	`)`
`85`	`85`	`)`
`86`	`86`	`if re.match(`
	`87`	`+ # extended latin`
	`88`	`+ r"(^[\u0100-\u017F\u0180-\u024F]"`
`87`	`89`	`# dot-atom`
`88`		- r"(^[-!#$%&'+/=?^_`{}\|~0-9a-z]+(\.[-!#$%&'+/=?^_`{}\|~0-9a-z]+)*$"
	`90`	+ + r"\|[-!#$%&'+/=?^_`{}\|~0-9a-z]+(\.[-!#$%&'+/=?^_`{}\|~0-9a-z]+)*$"
`89`	`91`	`# quoted-string`
`90`		`- + r'\|^"([\001-\010\013\014\016-\037!#-\[\]-\177]\|\\[\001-\011\013\014\016-\177])*"$)',`
	`92`	`+ + r'\|^"([\001-\010\013\014\016-\037!#-\[\]-\177]\|\\[\011.])*"$)',`
`91`	`93`	`username_part,`
`92`	`94`	`re.IGNORECASE,`
`93`	`95`	`)`