You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2017/10/19 20:01:33 UTC
[1/2] tinkerpop git commit: I had to tweak master/ on the last merge
and the tweak I did was more clever than what I have in tp32/. Thus,
back porting it. CTR.
Repository: tinkerpop
Updated Branches:
refs/heads/master a11088ba4 -> 584be0690
I had to tweak master/ on the last merge and the tweak I did was more clever than what I have in tp32/. Thus, back porting it. CTR.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3648f80a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3648f80a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3648f80a
Branch: refs/heads/master
Commit: 3648f80acea2e7d29bb808402ac816b788ec383b
Parents: ff49cbe
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Oct 19 14:00:37 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Oct 19 14:00:37 2017 -0600
----------------------------------------------------------------------
.../tinkerpop/gremlin/python/jsr223/PythonTranslator.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3648f80a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java
index a5bfd25..4af4578 100644
--- a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java
+++ b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java
@@ -198,10 +198,10 @@ public class PythonTranslator implements Translator.ScriptTranslator {
return "Vertex(" + convertToString(vertex.id()) + "," + convertToString(vertex.label()) + ")";
} else if (object instanceof Edge) {
final Edge edge = (Edge) object;
- return "Edge(" + convertToString(edge.id()) + ", " +
- "Vertex(" + convertToString(edge.outVertex().id()) + ")," +
- convertToString(edge.label()) +
- ",Vertex(" + convertToString(edge.inVertex().id()) + "))";
+ return "Edge(" + convertToString(edge.id()) + "," +
+ convertToString(edge.outVertex()) + "," +
+ convertToString(edge.label()) + "," +
+ convertToString(edge.inVertex()) + ")";
} else { // VertexProperty
final VertexProperty vertexProperty = (VertexProperty) object;
return "VertexProperty(" + convertToString(vertexProperty.id()) + "," +
[2/2] tinkerpop git commit: Merge branch 'tp32'
Posted by ok...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/584be069
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/584be069
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/584be069
Branch: refs/heads/master
Commit: 584be0690fa08dcae3f108df6d8e701174e1db0c
Parents: a11088b 3648f80
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Oct 19 14:01:28 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Oct 19 14:01:28 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------