Skip to content

Python3 compatibility #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
swilly22 merged 2 commits into from
Nov 19, 2017
Merged

Python3 compatibility #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a5eac3
Python3 compatibility
RMKD Nov 10, 2017
d83500b
Removing decode artefact
RMKD Nov 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions redisgraph/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import random
import string

from query_result import QueryResult
from .query_result import QueryResult


def random_string(length=10):
"""
Returns a random N chracter long string.
"""
return ''.join(random.choice(string.lowercase) for x in range(length))
return ''.join(random.choice(string.ascii_lowercase) for x in range(length))


class Node(object):
Expand All @@ -28,7 +28,7 @@ def __str__(self):
return '({alias}:{label} {{{properties}}})'.format(
alias=self.alias,
label=self.label,
properties=','.join(key+':'+str(val) for key, val in self.properties.iteritems()))
properties=','.join(key+':'+str(val) for key, val in self.properties.items()))


class Edge(object):
Expand All @@ -51,7 +51,7 @@ def __str__(self):
return '({src_alias})-[:{relation} {{{properties}}}]->({dest_alias})'.format(
src_alias=self.src_node.alias,
relation=self.relation,
properties=','.join(key+':'+str(val) for key, val in self.properties.iteritems()),
properties=','.join(key+':'+str(val) for key, val in self.properties.items()),
dest_alias=self.dest_node.alias)
else:
return '({src_alias})-[:{relation}]->({dest_alias})'.format(
Expand Down Expand Up @@ -97,7 +97,7 @@ def commit(self):
"""

query = 'CREATE '
for _, node in self.nodes.iteritems():
for _, node in self.nodes.items():
query += str(node) + ','

for edge in self.edges:
Expand Down
1 change: 1 addition & 0 deletions redisgraph/query_result.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ def _retrieve_data_from_statistics(self, statistics):
@staticmethod
def _get_value(prop, statistics):
for stat in statistics:
stat = stat.decode()
Copy link
Contributor

@swilly22 swilly22 Nov 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not that familiar with Python3, could you explain why do we need decode here?

if prop in stat:
return float(stat.split(': ')[1].split(' ')[0])

Expand Down