Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1784 0260d34c2 -> 61890d3e6
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/61890d3e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/61890d3e Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/61890d3e Branch: refs/heads/TINKERPOP-1784 Commit: 61890d3e6585b46c2de6ad47457b4986994584d0 Parents: 0260d34 Author: Stephen Mallette <[email protected]> Authored: Thu Sep 28 15:30:54 2017 -0400 Committer: Stephen Mallette <[email protected]> Committed: Thu Sep 28 15:30:54 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/61890d3e/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
