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/11/02 17:38:05 UTC
[08/50] tinkerpop git commit: TINKERPOP-1784 Deleted some dead code
TINKERPOP-1784 Deleted some dead code
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cb73ec05
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cb73ec05
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cb73ec05
Branch: refs/heads/TINKERPOP-1784
Commit: cb73ec0565d7436557dc841c2bdd55d7a577ae39
Parents: 692f50d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Sep 28 15:30:54 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Nov 2 13:37:22 2017 -0400
----------------------------------------------------------------------
.../src/main/jython/radish/feature_steps.py | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cb73ec05/gremlin-python/src/main/jython/radish/feature_steps.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/radish/feature_steps.py b/gremlin-python/src/main/jython/radish/feature_steps.py
index 2db5922..e3b82c3 100644
--- a/gremlin-python/src/main/jython/radish/feature_steps.py
+++ b/gremlin-python/src/main/jython/radish/feature_steps.py
@@ -76,12 +76,12 @@ def assert_result(step, characterized_as):
def __convert(val, ctx):
- if isinstance(val, dict): # convert dictionary keys/values
+ if isinstance(val, dict): # convert dictionary keys/values
n = {}
for key, value in val.items():
n[__convert(key, ctx)] = __convert(value, ctx)
return n
- elif isinstance(val, unicode):
+ elif isinstance(val, unicode): # stupid unicode/string nonsense in py 2/x
return __convert(val.encode('utf-8'), ctx)
elif isinstance(val, str) and re.match("^l\[.*\]$", val): # parse list
return list(map((lambda x: __convert(x, ctx)), val[2:-1].split(",")))
@@ -100,16 +100,6 @@ def __convert(val, ctx):
else:
return val
-#
-# def __ordered_assertion(data, result, ctx):
-# # results from traversal should have the same number of entries as the feature data table
-# assert_that(len(result), equal_to(len(data)))
-#
-# # assert the results in order they are expected in the data from the features file
-# for ix, line in enumerate(data):
-# assert_that(result[ix], equal_to(__convert(line[0], ctx)))
-#
-
def __table_assertion(data, result, ctx, ordered):
# results from traversal should have the same number of entries as the feature data table