Reworked the docs example code

README.rst

@@ -25,7 +25,7 @@ Example Usage
 .. code:: python
 
     from neo4j.v1 import GraphDatabase, basic_auth
-    driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "neo4j"))
+    driver = GraphDatabase.driver("bolt://localhost:7687", auth=basic_auth("neo4j", "neo4j"))
     session = driver.session()
     session.run("CREATE (a:Person {name:'Bob'})")
     result = session.run("MATCH (a:Person) RETURN a.name AS name")

docs/source/index.rst

@@ -73,7 +73,7 @@ Example
 
     from neo4j.v1 import GraphDatabase
 
-    driver = GraphDatabase.driver("bolt://localhost")
+    driver = GraphDatabase.driver("bolt://localhost:7687")
     session = driver.session()
 
     session.run("MERGE (a:Person {name:'Alice'})")

example.py

@@ -21,19 +21,22 @@
 from neo4j.v1.session import GraphDatabase, basic_auth
 
 
-driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "neo4j"))
-session = driver.session()
+driver = GraphDatabase.driver("bolt://localhost:7687", auth=basic_auth("neo4j", "neo4j"))
 
-session.run("MERGE (a:Person {name:'Alice'})")
+with driver.session() as session:
 
-friends = ["Bob", "Carol", "Dave", "Eve", "Frank"]
-with session.begin_transaction() as tx:
-    for friend in friends:
-        tx.run("MATCH (a:Person {name:'Alice'}) "
-               "MERGE (a)-[:KNOWS]->(x:Person {name:{n}})", {"n": friend})
-    tx.success = True
+    with session.begin_transaction() as transaction:
+        transaction.run("MERGE (a:Person {name:'Alice'})")
+        transaction.success = True
 
-for friend, in session.run("MATCH (a:Person {name:'Alice'})-[:KNOWS]->(x) RETURN x"):
-    print('Alice says, "hello, %s"' % friend["name"])
+        friends = ["Bob", "Carol", "Dave", "Eve", "Frank"]
+        with session.begin_transaction() as tx:
+            for friend in friends:
+                tx.run("MATCH (a:Person {name:'Alice'}) "
+                       "MERGE (a)-[:KNOWS]->(x:Person {name:{n}})", {"n": friend})
+            tx.success = True
 
-session.close()
+        for friend, in session.run("MATCH (a:Person {name:'Alice'})-[:KNOWS]->(x) RETURN x"):
+            print('Alice says, "hello, %s"' % friend["name"])
+
+# TODO: driver.close()

neo4j/__main__.py

@@ -38,7 +38,7 @@ def main():
     parser.add_argument("-p", "--parameter", action="append", metavar="NAME=VALUE")
     parser.add_argument("-q", "--quiet", action="store_true")
     parser.add_argument("-U", "--user", default="neo4j")
-    parser.add_argument("-u", "--url", default="bolt://localhost", metavar="CONNECTION_URL")
+    parser.add_argument("-u", "--url", default="bolt://localhost:7687", metavar="CONNECTION_URL")
     parser.add_argument("-v", "--verbose", action="count")
     parser.add_argument("-x", "--times", type=int, default=1)
     parser.add_argument("-z", "--summary", action="store_true")

neo4j/v1/session.py

@@ -67,7 +67,7 @@ def driver(url, **config):
         configuration:
 
             >>> from neo4j.v1 import GraphDatabase
-            >>> driver = GraphDatabase.driver("bolt://localhost")
+            >>> driver = GraphDatabase.driver("bolt://localhost:7687")
 
         """
         return Driver(url, **config)
@@ -152,7 +152,7 @@ def session(self):
         specified within this driver:
 
             >>> from neo4j.v1 import GraphDatabase
-            >>> driver = GraphDatabase.driver("bolt://localhost")
+            >>> driver = GraphDatabase.driver("bolt://localhost:7687")
             >>> session = driver.session()
         """
         session = None

test/auth.py

@@ -35,7 +35,7 @@ def update_password(user, password, new_password):
 
     token = basic_auth(user, password)
     setattr(token, "new-credentials", new_password)  # TODO: hopefully switch hyphen to underscore on server
-    GraphDatabase.driver("bolt://localhost", auth=token).session().close()
+    GraphDatabase.driver("bolt://localhost:7687", auth=token).session().close()
 
 
 if __name__ == "__main__":

test/tck/steps/driver_auth_steps.py

@@ -25,17 +25,17 @@
 
 @given("a driver configured with auth disabled")
 def step_impl(context):
-    context.driver = GraphDatabase.driver("bolt://localhost", encrypted=False)
+    context.driver = GraphDatabase.driver("bolt://localhost:7687", encrypted=False)
 
 
 @given("a driver is configured with auth enabled and correct password is provided")
 def step_impl(context):
-    context.driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "neo4j"), encrypted=False)
+    context.driver = GraphDatabase.driver("bolt://localhost:7687", auth=basic_auth("neo4j", "neo4j"), encrypted=False)
 
 
 @given("a driver is configured with auth enabled and the wrong password is provided")
 def step_impl(context):
-    context.driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "wrong"), encrypted=False)
+    context.driver = GraphDatabase.driver("bolt://localhost:7687", auth=basic_auth("neo4j", "wrong"), encrypted=False)
 
 
 @step("reading and writing to the database should be possible")

test/tck/tck_util.py

@@ -23,7 +23,7 @@
 from test.tck.test_value import TestValue
 from test.tck.resultparser import parse_values_to_comparable
 
-driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "neo4j"), encrypted=False)
+driver = GraphDatabase.driver("bolt://localhost:7687", auth=basic_auth("neo4j", "neo4j"), encrypted=False)
 runners = []