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

Author: technige

requirements.txt

@@ -1,2 +1,2 @@
 neobolt<2,>=1.7
-neotime<2,>=1.7
+neotime<2,>=1.7.1

setup.py

@@ -30,8 +30,8 @@
 from neo4j.meta import package, version
 
 install_requires = [
-    "neobolt==1.7.0rc5",
-    "neotime",
+    "neobolt<2,>=1.7",
+    "neotime<2,>=1.7.1",
 ]
 classifiers = [
     "Intended Audience :: Developers",

test/examples/custom_resolver_example.py

@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+
+# Copyright (c) 2002-2018 "Neo4j,"
+# Neo4j Sweden AB [http://neo4j.com]
+#
+# This file is part of Neo4j.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# tag::custom-resolver-import[]
+from neo4j import GraphDatabase
+# end::custom-resolver-import[]
+
+
+# tag::custom-resolver[]
+
+class CustomResolverExample:
+
+    def __init__(self, uri, user, password):
+        self._driver = GraphDatabase.driver(uri, auth=(user, password), resolver=self.resolve)
+
+    def resolve(self, address):
+        host, port = address
+        if host == "x.example.com":
+            yield "a.example.com", port
+            yield "b.example.com", port
+            yield "c.example.com", port
+        else:
+            yield host, port
+
+    def close(self):
+        self._driver.close()
+
+# end::custom-resolver[]