You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2017/07/18 21:14:40 UTC
[1/2] tinkerpop git commit: Ensure serializer iteration is consistent
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 2704245c2 -> a2553b37f
Ensure serializer iteration is consistent
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/40c76e9e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/40c76e9e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/40c76e9e
Branch: refs/heads/tp32
Commit: 40c76e9ecddd244aba2e5c081f07911b66363de8
Parents: 937981a
Author: Alan Boudreault <al...@alanb.ca>
Authored: Thu Jul 13 11:05:44 2017 -0400
Committer: Alan Boudreault <al...@alanb.ca>
Committed: Thu Jul 13 11:05:44 2017 -0400
----------------------------------------------------------------------
.../src/main/jython/gremlin_python/structure/io/graphson.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/40c76e9e/gremlin-python/src/main/jython/gremlin_python/structure/io/graphson.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/structure/io/graphson.py b/gremlin-python/src/main/jython/gremlin_python/structure/io/graphson.py
index f33f528..8102ee8 100644
--- a/gremlin-python/src/main/jython/gremlin_python/structure/io/graphson.py
+++ b/gremlin-python/src/main/jython/gremlin_python/structure/io/graphson.py
@@ -19,6 +19,7 @@ under the License.
from aenum import Enum
import json
import six
+from collections import OrderedDict
from gremlin_python import statics
from gremlin_python.statics import FloatType, FunctionType, IntType, LongType, TypeType
@@ -26,7 +27,10 @@ from gremlin_python.process.traversal import Binding, Bytecode, P, Traversal, Tr
from gremlin_python.structure.graph import Edge, Property, Vertex, VertexProperty, Path
-_serializers = {}
+# When we fall back to a superclass's serializer, we iterate over this map.
+# We want that iteration order to be consistent, so we use an OrderedDict,
+# not a dict.
+_serializers = OrderedDict()
_deserializers = {}
[2/2] tinkerpop git commit: Merge branch 'pr-675' into tp32
Posted by sp...@apache.org.
Merge branch 'pr-675' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a2553b37
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a2553b37
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a2553b37
Branch: refs/heads/tp32
Commit: a2553b37f148ea23972dad52fcfbdbfe3bed9e2c
Parents: 2704245 40c76e9
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jul 18 17:09:31 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jul 18 17:09:31 2017 -0400
----------------------------------------------------------------------
.../src/main/jython/gremlin_python/structure/io/graphson.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------