Remove shorthand arguments to Property, Wild and Keys selectors

Author: jg-rp

jsonpath/parse.py

@@ -356,7 +356,6 @@ def parse_selectors(self, stream: TokenStream) -> tuple[JSONPathSelector, ...]:
                     env=self.env,
                     token=token,
                     name=token.value,
-                    shorthand=True,
                 ),
             )
 
@@ -365,7 +364,6 @@ def parse_selectors(self, stream: TokenStream) -> tuple[JSONPathSelector, ...]:
                 WildSelector(
                     env=self.env,
                     token=token,
-                    shorthand=True,
                 ),
             )
 
@@ -374,7 +372,6 @@ def parse_selectors(self, stream: TokenStream) -> tuple[JSONPathSelector, ...]:
                 KeysSelector(
                     env=self.env,
                     token=token,
-                    shorthand=True,
                 ),
             )
 
@@ -422,25 +419,16 @@ def parse_bracketed_selection(self, stream: TokenStream) -> List[JSONPathSelecto
                         env=self.env,
                         token=token,
                         name=self._decode_string_literal(token),
-                        shorthand=False,
                     ),
                 )
                 stream.next()
             elif token.kind == TOKEN_COLON:
                 selectors.append(self.parse_slice(stream))
             elif token.kind == TOKEN_WILD:
-                selectors.append(
-                    WildSelector(
-                        env=self.env,
-                        token=token,
-                        shorthand=False,
-                    )
-                )
+                selectors.append(WildSelector(env=self.env, token=token))
                 stream.next()
             elif token.kind == TOKEN_KEYS:
-                selectors.append(
-                    KeysSelector(env=self.env, token=token, shorthand=False)
-                )
+                selectors.append(KeysSelector(env=self.env, token=token))
                 stream.next()
             elif token.kind == TOKEN_FILTER:
                 selectors.append(self.parse_filter_selector(stream))

jsonpath/selectors.py

@@ -56,19 +56,11 @@ def resolve_async(self, node: JSONPathMatch) -> AsyncIterable[JSONPathMatch]:
 class PropertySelector(JSONPathSelector):
     """A shorthand or bracketed property selector."""
 
-    __slots__ = ("name", "shorthand")
+    __slots__ = ("name",)
 
-    def __init__(
-        self,
-        *,
-        env: JSONPathEnvironment,
-        token: Token,
-        name: str,
-        shorthand: bool,
-    ) -> None:
+    def __init__(self, *, env: JSONPathEnvironment, token: Token, name: str) -> None:
         super().__init__(env=env, token=token)
         self.name = name
-        self.shorthand = shorthand
 
     def __str__(self) -> str:
         return canonical_string(self.name)
@@ -190,13 +182,10 @@ class KeysSelector(JSONPathSelector):
     NOTE: This is a non-standard selector.
     """
 
-    __slots__ = ("shorthand",)
+    __slots__ = ()
 
-    def __init__(
-        self, *, env: JSONPathEnvironment, token: Token, shorthand: bool
-    ) -> None:
+    def __init__(self, *, env: JSONPathEnvironment, token: Token) -> None:
         super().__init__(env=env, token=token)
-        self.shorthand = shorthand
 
     def __str__(self) -> str:
         return self.env.keys_selector_token
@@ -298,13 +287,7 @@ async def resolve_async(self, node: JSONPathMatch) -> AsyncIterable[JSONPathMatc
 class WildSelector(JSONPathSelector):
     """Select all items from a sequence/array or values from a mapping/object."""
 
-    __slots__ = ("shorthand",)
-
-    def __init__(
-        self, *, env: JSONPathEnvironment, token: Token, shorthand: bool
-    ) -> None:
-        super().__init__(env=env, token=token)
-        self.shorthand = shorthand
+    __slots__ = ()
 
     def __str__(self) -> str:
         return "*"