Updated index/readme

Author: technige

README.rst

@@ -1,66 +1,57 @@
-============================
+****************************
 Neo4j Bolt Driver for Python
-============================
+****************************
 
-
-Installation
-============
-
-To install the latest stable version, use:
-
-.. code:: bash
-
-    pip install neo4j-driver
-
-For the most up-to-date version (possibly unstable), use:
-
-.. code:: bash
-
-    pip install git+https://github.com/neo4j/neo4j-python-driver.git#egg=neo4j-driver
+The Official Neo4j Driver for Python supports Neo4j 3.0 and above and Python versions 2.7, 3.4 and 3.5.
 
 
-Example Usage
+Quick Example
 =============
 
-.. code:: python
+.. code-block:: python
 
     from neo4j.v1 import GraphDatabase, basic_auth
 
-    driver = GraphDatabase.driver("bolt://localhost:7687", auth=basic_auth("neo4j", "password"))
+    uri = "bolt://localhost:7687"
+    auth_token = basic_auth("neo4j", "password")
+    driver = GraphDatabase.driver(uri, auth=auth_token)
 
-    with driver.session() as session:
+    def print_friends_of(name):
+        with driver.session() as session:
+            with session.begin_transaction() as tx:
+                for record in tx.run("MATCH (a:Person)-[:KNOWS]->(f) "
+                                     "WHERE a.name = {name} "
+                                     "RETURN f.name", name=name):
+                    print(record["f.name"])
 
-        with session.begin_transaction() as write_tx:
-            write_tx.run("CREATE (a:Person {name:{name},age:{age}})", name="Alice", age=33)
-            write_tx.run("CREATE (a:Person {name:{name},age:{age}})", name="Bob", age=44)
+    print_friends_of("Alice")
 
-        with session.begin_transaction() as read_tx:
-            result = read_tx.run("MATCH (a:Person) RETURN a.name AS name, a.age AS age")
-            for record in result:
-                print("%s is %d years old" % (record["name"], record["age"]))
 
-    driver.close()
-
-
-Command Line
+Installation
 ============
 
+To install the latest stable version, use:
+
 .. code:: bash
 
-    python -m neo4j "CREATE (a:Person {name:'Alice'}) RETURN a, labels(a), a.name"
+    pip install neo4j-driver
+
+For the most up-to-date version (possibly unstable), use:
 
+.. code:: bash
 
-Documentation
-=============
+    pip install git+https://github.com/neo4j/neo4j-python-driver.git#egg=neo4j-driver
 
-For more information such as manual, driver API documentations, changelogs, please find them in the wiki of this repo.
 
-* `Driver Wiki`_
+Other Information
+=================
+
 * `Neo4j Manual`_
-* `Neo4j Refcard`_
-* `Sample Project Using Driver`_
+* `Neo4j Quick Reference Card`_
+* `Example Project`_
+* `Driver Wiki`_ (includes change logs)
 
-.. _`Sample Project Using Driver`: https://github.com/neo4j-examples/movies-python-bolt
-.. _`Driver Wiki`: https://github.com/neo4j/neo4j-python-driver/wiki
 .. _`Neo4j Manual`: https://neo4j.com/docs/
-.. _`Neo4j Refcard`: https://neo4j.com/docs/cypher-refcard/current/
+.. _`Neo4j Quick Reference Card`: https://neo4j.com/docs/cypher-refcard/current/
+.. _`Example Project`: https://github.com/neo4j-examples/movies-python-bolt
+.. _`Driver Wiki`: https://github.com/neo4j/neo4j-python-driver/wiki

docs/source/index.rst

@@ -2,31 +2,49 @@
 Neo4j Bolt Driver for Python
 ****************************
 
+The Official Neo4j Driver for Python supports Neo4j 3.0 and above and Python versions 2.7, 3.4 and 3.5.
+
+
+Quick Example
+=============
+
 .. code-block:: python
 
     from neo4j.v1 import GraphDatabase, basic_auth
 
-    driver = GraphDatabase.driver("bolt://localhost:7687", auth=basic_auth("neo4j", "password"))
+    uri = "bolt://localhost:7687"
+    auth_token = basic_auth("neo4j", "password")
+    driver = GraphDatabase.driver(uri, auth=auth_token)
+
+    def print_friends_of(name):
+        with driver.session() as session:
+            with session.begin_transaction() as tx:
+                for record in tx.run("MATCH (a:Person)-[:KNOWS]->(f) "
+                                     "WHERE a.name = {name} "
+                                     "RETURN f.name", name=name):
+                    print(record["f.name"])
+
+    print_friends_of("Alice")
+
+
+Installation
+============
+
+To install the latest stable version, use:
 
-    with driver.session() as session:
+.. code:: bash
 
-        with session.begin_transaction() as tx:
-            session.run("MERGE (a:Person {name:'Alice'})")
+    pip install neo4j-driver
 
-        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})
+For the most up-to-date version (possibly unstable), use:
 
-        for record in session.run("MATCH (a:Person {name:'Alice'})-[:KNOWS]->(friend) RETURN friend"):
-            print('Alice says, "hello, %s"' % record["friend"]["name"])
+.. code:: bash
 
-    driver.close()
+    pip install git+https://github.com/neo4j/neo4j-python-driver.git#egg=neo4j-driver
 
 
-Contents
-========
+API Documentation
+=================
 
 .. toctree::
    :maxdepth: 1
@@ -36,10 +54,15 @@ Contents
    types
 
 
-Indices and tables
-==================
+Other Information
+=================
 
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
+* `Neo4j Manual`_
+* `Neo4j Quick Reference Card`_
+* `Example Project`_
+* `Driver Wiki`_ (includes change logs)
 
+.. _`Neo4j Manual`: https://neo4j.com/docs/
+.. _`Neo4j Quick Reference Card`: https://neo4j.com/docs/cypher-refcard/current/
+.. _`Example Project`: https://github.com/neo4j-examples/movies-python-bolt
+.. _`Driver Wiki`: https://github.com/neo4j/neo4j-python-driver/wiki

neo4j/v1/session.py

@@ -162,6 +162,9 @@ class Driver(object):
     def __init__(self, pool):
         self.pool = pool
 
+    def __del__(self):
+        self.close()
+
     def __enter__(self):
         return self
 
@@ -179,6 +182,7 @@ def session(self, access_mode=None):
     def close(self):
         if self.pool:
             self.pool.close()
+            self.pool = None
 
 
 class DirectDriver(Driver):

test/test_session.py

@@ -354,8 +354,12 @@ def test_record_repr(self):
 
 class ExplicitTransactionTestCase(ServerTestCase):
 
+    def setUp(self):
+        self.driver = GraphDatabase.driver(BOLT_URI, auth=AUTH_TOKEN)
+
     def test_can_commit_transaction(self):
-        with GraphDatabase.driver(BOLT_URI, auth=AUTH_TOKEN).session() as session:
+
+        with self.driver.session() as session:
             tx = session.begin_transaction()
 
             # Create a node
@@ -378,7 +382,7 @@ def test_can_commit_transaction(self):
             assert value == "bar"
 
     def test_can_rollback_transaction(self):
-        with GraphDatabase.driver(BOLT_URI, auth=AUTH_TOKEN).session() as session:
+        with self.driver.session() as session:
             tx = session.begin_transaction()
 
             # Create a node
@@ -399,7 +403,7 @@ def test_can_rollback_transaction(self):
             assert len(list(result)) == 0
 
     def test_can_commit_transaction_using_with_block(self):
-        with GraphDatabase.driver(BOLT_URI, auth=AUTH_TOKEN).session() as session:
+        with self.driver.session() as session:
             with session.begin_transaction() as tx:
                 # Create a node
                 result = tx.run("CREATE (a) RETURN id(a)")
@@ -421,7 +425,7 @@ def test_can_commit_transaction_using_with_block(self):
             assert value == "bar"
 
     def test_can_rollback_transaction_using_with_block(self):
-        with GraphDatabase.driver(BOLT_URI, auth=AUTH_TOKEN).session() as session:
+        with self.driver.session() as session:
             with session.begin_transaction() as tx:
                 # Create a node
                 result = tx.run("CREATE (a) RETURN id(a)")