[pre-commit.ci] auto fixes from pre-commit.com hooks

pre-commit-ci[bot] · Joshua Trzebiatowski · commit e660e169ef03 · 2024-07-10T12:07:34.000-05:00
for more information, see https://pre-commit.ci
diff --git a/src/check_jsonschema/cli/main_command.py b/src/check_jsonschema/cli/main_command.py
@@ -10,7 +10,7 @@
 
 from ..catalog import CUSTOM_SCHEMA_NAMES, SCHEMA_CATALOG
 from ..checker import SchemaChecker
-from ..formats import KNOWN_FORMATS, RegexVariantName
+from ..formats import KNOWN_FORMATS, RegexVariantName, EmailVariantName
 from ..instance_loader import InstanceLoader
 from ..parsers import SUPPORTED_FILE_FORMATS
 from ..reporter import REPORTER_BY_NAME, Reporter
@@ -283,7 +283,7 @@ def main(
     else:
         args.disable_formats = normalized_disable_formats
 
-    args.format_email = RegexVariantName(format_email)
+    args.format_email = EmailVariantName(format_email)
     args.format_regex = RegexVariantName(format_regex)
     args.disable_cache = no_cache
     args.default_filetype = default_filetype
diff --git a/src/check_jsonschema/formats/__init__.py b/src/check_jsonschema/formats/__init__.py
@@ -9,7 +9,12 @@
 import jsonschema.validators
 import regress
 
-from .implementations import validate_rfc3339, validate_rfc5321, validate_rfc6531, validate_time
+from .implementations import (
+    validate_rfc3339,
+    validate_rfc5321,
+    validate_rfc6531,
+    validate_time,
+)
 
 # all known format strings except for a selection from draft3 which have either
 # been renamed or removed:
diff --git a/src/check_jsonschema/formats/implementations/rfc5321.py b/src/check_jsonschema/formats/implementations/rfc5321.py
@@ -15,7 +15,7 @@
     \[[\t -Z^-~]*]
     )
     $
-""",
+    """,
     re.VERBOSE | re.ASCII,
 )
 
@@ -31,9 +31,7 @@ def validate(email_str: object) -> bool:
     import timeit
 
     N = 100_000
-    tests = (
-        ("basic", "user@example.com"),
-    )
+    tests = (("basic", "user@example.com"),)
 
     print("benchmarking")
     for name, val in tests:
diff --git a/src/check_jsonschema/formats/implementations/rfc6531.py b/src/check_jsonschema/formats/implementations/rfc6531.py
@@ -5,15 +5,11 @@
     ^
     # local part
     (
-    ([0-9a-z!#$%&'*+-\/=?^_`\{|\}~\u{80}-\u{10FFFF}]+(\.[0-9a-z!#$%&'*+-\/=?^_`\{|\}~\u{80}-\u{10FFFF}]+)*)
+    ([0-9a-z!#$%&'*+-\/=?^_`\{|\}~\u0080-\U0010FFFF]+(\.[0-9a-z!#$%&'*+-\/=?^_`\{|\}~\u0080-\U0010FFFF]+)*)
     |
     # quoted string
-    ("(
-    [\x20-\x21\x23-\x5B\x5D-\x7E\u{80}-\u{10FFFF}]
-    |
-    \\[\x20-\x7E]
-    )*")
-    )(?<!.{64,})
+    "([\x20-\x21\x23-\x5B\x5D-\x7E\u0080-\U0010FFFF]|\\[\x20-\x7E])*"
+    )
     @
     # Domain/address
     (
@@ -36,11 +32,11 @@
     )\])
     |
     # Domain
-    ((?!.{256,})(([0-9a-z\u{80}-\u{10FFFF}]([0-9a-z-\u{80}-\u{10FFFF}]*[0-9a-z\u{80}-\u{10FFFF}])?))(\.([0-9a-z\u{80}-\u{10FFFF}]([0-9a-z-\u{80}-\u{10FFFF}]*[0-9a-z\u{80}-\u{10FFFF}])?))*)
+    ((?!.{256,})(([0-9a-z\u0080-\U0010FFFF]([0-9a-z-\u0080-\U0010FFFF]*[0-9a-z\u0080-\U0010FFFF])?))(\.([0-9a-z\u0080-\U0010FFFF]([0-9a-z-\u0080-\U0010FFFF]*[0-9a-z\u0080-\U0010FFFF])?))*)
     )
     $
-""",
-    re.VERBOSE | re.ASCII,
+    """,
+    re.VERBOSE | re.UNICODE,
 )
 
 
@@ -55,9 +51,7 @@ def validate(email_str: object) -> bool:
     import timeit
 
     N = 100_000
-    tests = (
-        ("basic", "user@example.com"),
-    )
+    tests = (("basic", "user@example.com"),)
 
     print("benchmarking")
     for name, val in tests:

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`\[[\t -Z^-~]*]`
`16`	`16`	`)`
`17`	`17`	`$`
`18`		`-""",`
	`18`	`+ """,`
`19`	`19`	`re.VERBOSE \| re.ASCII,`
`20`	`20`	`)`
`21`	`21`
`@@ -31,9 +31,7 @@ def validate(email_str: object) -> bool:`
`31`	`31`	`import timeit`
`32`	`32`
`33`	`33`	`N = 100_000`
`34`		`- tests = (`
`35`		`- ("basic", "user@example.com"),`
`36`		`- )`
	`34`	`+ tests = (("basic", "user@example.com"),)`
`37`	`35`
`38`	`36`	`print("benchmarking")`
`39`	`37`	`for name, val in tests:`
Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,11 @@`
`5`	`5`	`^`
`6`	`6`	`# local part`
`7`	`7`	`(`
`8`		- ([0-9a-z!#$%&'+-\/=?^_`\{\|\}~\u{80}-\u{10FFFF}]+(\.[0-9a-z!#$%&'+-\/=?^_`\{\|\}~\u{80}-\u{10FFFF}]+)*)
	`8`	+ ([0-9a-z!#$%&'+-\/=?^_`\{\|\}~\u0080-\U0010FFFF]+(\.[0-9a-z!#$%&'+-\/=?^_`\{\|\}~\u0080-\U0010FFFF]+)*)
`9`	`9`	`\|`
`10`	`10`	`# quoted string`
`11`		`- ("(`
`12`		`- [\x20-\x21\x23-\x5B\x5D-\x7E\u{80}-\u{10FFFF}]`
`13`		`- \|`
`14`		`- \\[\x20-\x7E]`
`15`		`- )*")`
`16`		`- )(?<!.{64,})`
	`11`	`+ "([\x20-\x21\x23-\x5B\x5D-\x7E\u0080-\U0010FFFF]\|\\[\x20-\x7E])*"`
	`12`	`+ )`
`17`	`13`	`@`
`18`	`14`	`# Domain/address`
`19`	`15`	`(`
`@@ -36,11 +32,11 @@`
`36`	`32`	`)\])`
`37`	`33`	`\|`
`38`	`34`	`# Domain`
`39`		`- ((?!.{256,})(([0-9a-z\u{80}-\u{10FFFF}]([0-9a-z-\u{80}-\u{10FFFF}][0-9a-z\u{80}-\u{10FFFF}])?))(\.([0-9a-z\u{80}-\u{10FFFF}]([0-9a-z-\u{80}-\u{10FFFF}][0-9a-z\u{80}-\u{10FFFF}])?))*)`
	`35`	`+ ((?!.{256,})(([0-9a-z\u0080-\U0010FFFF]([0-9a-z-\u0080-\U0010FFFF][0-9a-z\u0080-\U0010FFFF])?))(\.([0-9a-z\u0080-\U0010FFFF]([0-9a-z-\u0080-\U0010FFFF][0-9a-z\u0080-\U0010FFFF])?))*)`
`40`	`36`	`)`
`41`	`37`	`$`
`42`		`-""",`
`43`		`- re.VERBOSE \| re.ASCII,`
	`38`	`+ """,`
	`39`	`+ re.VERBOSE \| re.UNICODE,`
`44`	`40`	`)`
`45`	`41`
`46`	`42`
`@@ -55,9 +51,7 @@ def validate(email_str: object) -> bool:`
`55`	`51`	`import timeit`
`56`	`52`
`57`	`53`	`N = 100_000`
`58`		`- tests = (`
`59`		`- ("basic", "user@example.com"),`
`60`		`- )`
	`54`	`+ tests = (("basic", "user@example.com"),)`
`61`	`55`
`62`	`56`	`print("benchmarking")`
`63`	`57`	`for name, val in tests:`