Few changes

Author: technige

examples/test_examples.py

@@ -42,11 +42,11 @@ def test_minimal_working_example(self):
         driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "password"))
         session = driver.session()
 
-        session.run("CREATE (neo:Person {name:'Neo', age:23})")
+        session.run("CREATE (a:Person {name:'Arthur', title:'King'})", )
 
-        result = session.run("MATCH (p:Person) WHERE p.name = 'Neo' RETURN p.age")
+        result = session.run("MATCH (a:Person) WHERE a.name = 'Arthur' RETURN a.name AS name, a.title AS title")
         while result.next():
-            print("Neo is %d years old." % result["p.age"])
+            print("%s %s" % (result["title"], result["name"]))
 
         session.close()
         # end::minimal-example[]

neo4j/v1/compat.py

@@ -32,19 +32,39 @@
 try:
     unicode
 except NameError:
+    # Python 3
+
     integer = int
     string = str
 
+    def ustr(x):
+        if isinstance(x, bytes):
+            return x.decode("utf-8")
+        elif isinstance(x, str):
+            return x
+        else:
+            return str(x)
+
     def hex2(x):
         if x < 0x10:
             return "0" + hex(x)[2:].upper()
         else:
             return hex(x)[2:].upper()
 
 else:
+    # Python 2
+
     integer = (int, long)
     string = (str, unicode)
 
+    def ustr(x):
+        if isinstance(x, str):
+            return x.decode("utf-8")
+        elif isinstance(x, unicode):
+            return x
+        else:
+            return unicode(x)
+
     def hex2(x):
         x = ord(x)
         if x < 0x10: