Merge branch '1.1' of https://github.com/neo4j/neo4j-python-driver into 1.1

Author: Zhen Li

MANIFEST.in

@@ -0,0 +1 @@
+recursive-exclude test *

README.rst

@@ -24,8 +24,8 @@ Example Usage
 
 .. code:: python
 
-    from neo4j.v1 import GraphDatabase
-    driver = GraphDatabase.driver("bolt://localhost")
+    from neo4j.v1 import GraphDatabase, basic_auth
+    driver = GraphDatabase.driver("bolt://localhost", 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")
@@ -41,3 +41,8 @@ Command Line
 .. code:: bash
 
     python -m neo4j "CREATE (a:Person {name:'Alice'}) RETURN a, labels(a), a.name"
+
+Changelog
+============
+
+Find the changelog in the wiki of this repo

examples/test_examples.py

@@ -225,11 +225,11 @@ def test_handle_cypher_error(self):
         driver = GraphDatabase.driver("bolt://localhost", auth=auth_token)
         session = driver.session()
         with self.assertRaises(RuntimeError):
-            # tag::handle-cypher-error
+            # tag::handle-cypher-error[]
             try:
                 session.run("This will cause a syntax error").consume()
             except CypherError:
                 raise RuntimeError("Something really bad has happened!")
             finally:
                 session.close()
-            # end::handle-cypher-error
+            # end::handle-cypher-error[]

neo4j/meta.py

@@ -19,4 +19,4 @@
 # limitations under the License.
 
 
-version = "1.1.0b1"
+version = "1.1.0b1"

neo4j/v1/connection.py

@@ -442,5 +442,12 @@ def connect(host, port=None, ssl_context=None, **config):
         if __debug__: log_info("~~ [CLOSE]")
         s.shutdown(SHUT_RDWR)
         s.close()
-    else:
+    elif agreed_version == 1:
         return Connection(s, der_encoded_server_certificate=der_encoded_server_certificate, **config)
+    elif agreed_version == 1213486160:
+        log_error("S: [CLOSE]")
+        raise ProtocolError("Server responded HTTP. Make sure you are not trying to connect to the http endpoint " +
+                            "(HTTP defaults to port 7474 whereas BOLT defaults to port 7687)")
+    else:
+        log_error("S: [CLOSE]")
+        raise ProtocolError("Unknown Bolt protocol version: %d", agreed_version)

neokit

@@ -90,6 +90,15 @@ def test_sessions_are_not_reused_if_still_in_use(self):
         session_1.close()
         assert session_1 is not session_2
 
+    def test_fail_nicely_when_connecting_to_http_port(self):
+        driver = GraphDatabase.driver("bolt://localhost:7474", auth=auth_token, encrypted=False)
+        with self.assertRaises(ProtocolError) as context:
+            driver.session()
+
+        assert str(context.exception) == "Server responded HTTP. Make sure you are not trying to connect to the http " \
+                                    "endpoint (HTTP defaults to port 7474 whereas BOLT defaults to port 7687)"
+
+
 
 class SecurityTestCase(ServerTestCase):