Merge branch '3.7-dev'

Author: Cole-Greer

CHANGELOG.asciidoc

@@ -111,6 +111,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Fixed issue in `gremlin-console` where it couldn't accept plugin files that included empty lines or invalid plugin names.
 * Modified grammar to make `none()` usage more consistent as a filter step where it can now be used to chain additional traversal steps and be used anonymously.
 * Added missing anonymous support for `disjunct()` in Python and Javascript.
+* Deprecated gremlin_python.process.__.has_key_ in favor of gremlin_python.process.__.has_key.
 
 [[release-3-7-3]]
 === TinkerPop 3.7.3 (October 23, 2024)

docs/src/reference/gremlin-variants.asciidoc

@@ -2554,7 +2554,7 @@ In situations where Python reserved words and global functions overlap with stan
 bits of conflicting Gremlin get an underscore appended as a suffix:
 
 *Steps* - <<all-step,all_()>>, <<and-step,and_()>>, <<any-step,any_()>>, <<as-step,as_()>>, <<filter-step,filter_()>>, <<from-step,from_()>>,
-<<has-step,has_key_>>, <<id-step,id_()>>, <<is-step,is_()>>, <<in-step,in_()>>, <<max-step,max_()>>,
+<<id-step,id_()>>, <<is-step,is_()>>, <<in-step,in_()>>, <<max-step,max_()>>,
 <<min-step,min_()>>, <<not-step,not_()>>, <<or-step,or_()>>, <<range-step,range_()>>, <<sum-step,sum_()>>,
 <<with-step,with_()>>
 

gremlin-python/src/main/python/gremlin_python/process/graph_traversal.py

@@ -536,11 +536,14 @@ def hasKey(self, *args):
             "gremlin_python.process.GraphTraversalSource.hasKey will be replaced by "
             "gremlin_python.process.GraphTraversalSource.has_key.",
             DeprecationWarning)
-        return self.has_key_(*args)
+        return self.has_key(*args)
 
     def has_key_(self, *args):
-        self.gremlin_lang.add_step("hasKey", *args)
-        return self
+        warnings.warn(
+            "gremlin_python.process.GraphTraversalSource.has_key_ will be replaced by "
+            "gremlin_python.process.GraphTraversalSource.has_key.",
+            DeprecationWarning)
+        return self.has_key(*args)
 
     def has_key(self, *args):
         self.gremlin_lang.add_step("hasKey", *args)
@@ -1303,10 +1306,18 @@ def hasKey(cls, *args):
             "gremlin_python.process.__.hasKey will be replaced by "
             "gremlin_python.process.__.has_key.",
             DeprecationWarning)
-        return cls.has_key_(*args)
+        return cls.has_key(*args)
 
     @classmethod
     def has_key_(cls, *args):
+        warnings.warn(
+            "gremlin_python.process.__.has_key_ will be replaced by "
+            "gremlin_python.process.__.has_key.",
+            DeprecationWarning)
+        return cls.has_key(*args)
+    
+    @classmethod
+    def has_key (cls, *args):
         return cls.graph_traversal(None, None, GremlinLang()).has_key_(*args)
 
     @classmethod
@@ -2026,12 +2037,14 @@ def has_id(*args):
 
 
 def hasKey(*args):
-    return __.has_key_(*args)
+    return __.has_key(*args)
 
 
 def has_key_(*args):
-    return __.has_key_(*args)
+    return __.has_key(*args)
 
+def has_key(*args):
+    return __.has_key(*args)
 
 def hasLabel(*args):
     return __.has_label(*args)
@@ -2493,7 +2506,7 @@ def where(*args):
 
 statics.add_static('hasKey', hasKey)
 
-statics.add_static('has_key', has_key_)
+statics.add_static('has_key', has_key)
 
 statics.add_static('hasLabel', hasLabel)