Cast path segment to int if it's supposed to be an index

Author: moomoohk

dpath/__init__.py

@@ -21,7 +21,7 @@
 ]
 
 from collections.abc import MutableMapping, MutableSequence
-from typing import Union, List, Any, Callable, Optional
+from typing import Union, List, Any, Callable, Optional, Sequence
 
 from dpath import segments, options
 from dpath.exceptions import InvalidKeyName, PathNotFound
@@ -30,7 +30,7 @@
 _DEFAULT_SENTINEL = object()
 
 
-def _split_path(path: Path, separator: Optional[str]) -> Union[List[PathSegment], PathSegment]:
+def _split_path(path: Path, separator: Optional[str] = "/") -> Union[List[PathSegment], PathSegment]:
     """
     Given a path and separator, return a tuple of segments. If path is
     already a non-leaf thing, return it.
@@ -45,16 +45,6 @@ def _split_path(path: Path, separator: Optional[str]) -> Union[List[PathSegment]
     else:
         split_segments = path.lstrip(separator).split(separator)
 
-        if options.CONVERT_INT_LIKE_SEGMENTS:
-            # Attempt to convert integer segments into actual integers.
-            final = []
-            for segment in split_segments:
-                try:
-                    final.append(int(segment))
-                except ValueError:
-                    final.append(segment)
-            split_segments = final
-
     return split_segments
 
 

dpath/options.py

@@ -1,2 +1 @@
 ALLOW_EMPTY_STRING_KEYS = False
-CONVERT_INT_LIKE_SEGMENTS = True

dpath/segments.py

@@ -320,6 +320,11 @@ def set(
     # For everything except the last value, walk down the path and
     # create if creator is set.
     for (i, segment) in enumerate(segments[:-1]):
+
+        # If segment is non-int but supposed to be a sequence index
+        if not isinstance(segment, int) and segment.isdigit() and isinstance(current, Sequence):
+            segment = int(segment)
+
         try:
             # Optimistically try to get the next value. This makes the
             # code agnostic to whether current is a list or a dict.

dpath/types.py

@@ -42,4 +42,4 @@ def creator(
         segments: Sequence[PathSegment],
         i: int,
         hints: Sequence[Tuple[PathSegment, type]] = ()
-    )"""
+    ) -> PathSegment"""