chore: Run pre-commit to upgrade syntax for Python 3.10

Author: mpenning

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
       - id: "pyupgrade"
         name: "Auto-standardize python syntax"
         args:
-          - "--py39-plus"
+          - "--py310-plus"
         language: "python"
         verbose: true
 

CHANGES.md

@@ -6,6 +6,11 @@
 - Summary:
     - To be determined
 
+## Version: 0.8.53
+
+- Summary:
+    - Run pre-commit for python 3.10+
+
 ## Version: 0.8.52
 
 - Summary:

ciscoconfparse2/ccp_abc.py

@@ -1445,7 +1445,7 @@ def re_search_children(self, regex, recurse=False):
     @logger.catch(reraise=True)
     def re_match_typed(
         self,
-        regex: Union[str, re.Pattern],
+        regex: str | re.Pattern,
         group: int = 1,
         result_type: type = str,
         default: Any = "",
@@ -1527,7 +1527,7 @@ def re_match_typed(
     @logger.catch(reraise=True)
     def re_match_iter_typed(
         self,
-        regex: Union[str, re.Pattern],
+        regex: str | re.Pattern,
         group: int = 1,
         result_type: type = str,
         default: Any = "",
@@ -1715,7 +1715,7 @@ def re_match_iter_typed(
     @logger.catch(reraise=True)
     def re_list_iter_typed(
         self,
-        regex: Union[str, re.Pattern],
+        regex: str | re.Pattern,
         group: int = 1,
         result_type: type = str,
         groupdict: dict = None,
@@ -1822,7 +1822,7 @@ def re_list_iter_typed(
     @logger.catch(reraise=True)
     def re_list_iter_typed_groupdict_none(
         self,
-        regex: Union[str, re.Pattern],
+        regex: str | re.Pattern,
         group: int = 1,
         result_type: type = str,
         groupdict: dict = None,
@@ -1869,7 +1869,7 @@ def re_list_iter_typed_groupdict_none(
     @logger.catch(reraise=True)
     def re_list_iter_typed_groupdict_dict(
         self,
-        regex: Union[str, re.Pattern],
+        regex: str | re.Pattern,
         group: int = 1,
         result_type: type = str,
         groupdict: dict = None,

ciscoconfparse2/ccp_util.py

@@ -49,7 +49,8 @@
     IPv6Network,
 )
 from ipaddress import collapse_addresses as ipaddr_collapse_addresses
-from typing import Any, Callable, Optional, Union
+from typing import Any, Optional, Union
+from collections.abc import Callable
 
 import attrs
 from dns import query, reversename, zone
@@ -617,7 +618,7 @@ def ip_net(arg):
 @attrs.define(repr=False, slots=False)
 class IPv4Obj:
     dna: str = "IPv4Obj"
-    v4input: Optional[Union[str, int]] = None
+    v4input: str | int | None = None
     strict: bool = False
     debug: int = 0
 
@@ -629,7 +630,7 @@ class IPv4Obj:
     # This method is on IPv4Obj().  @logger.catch() breaks the __init__() method.
     def __init__(
         self,
-        v4input: Optional[Union[str, int]] = None,
+        v4input: str | int | None = None,
         strict: bool = False,
         debug: int = 0,
     ):
@@ -1444,7 +1445,7 @@ def is_reserved(self):
 @attrs.define(repr=False, slots=False)
 class IPv6Obj:
     dna: str = "IPv6Obj"
-    v6input: Optional[Union[str, int]] = None
+    v6input: str | int | None = None
     strict: bool = False
     debug: int = 0
 
@@ -1458,7 +1459,7 @@ class IPv6Obj:
     # This method is on IPv6Obj().  @logger.catch() breaks the __init__() method.
     def __init__(
         self,
-        v6input: Optional[Union[str, int]] = None,
+        v6input: str | int | None = None,
         strict: bool = False,
         debug: int = 0,
     ):
@@ -4905,8 +4906,8 @@ class CiscoRange(UserList):
     result_type: Callable = None
     default_iter_attr: str = None
     reverse: bool = None
-    begin_obj: Union[CiscoIOSInterface, CiscoIOSXRInterface] = None
-    this_obj: Union[CiscoIOSInterface, CiscoIOSXRInterface] = None
+    begin_obj: CiscoIOSInterface | CiscoIOSXRInterface = None
+    this_obj: CiscoIOSInterface | CiscoIOSXRInterface = None
     iterate_attribute: int = None
     range_str: str = None
     """Explode Cisco ranges into a list of explicit items... examples below...