Merge branch 'master' of github.com:rethinkdb/rethinkdb-python into sawdog

Author: gabor-boros

Makefile

@@ -55,6 +55,7 @@ test-ci:
 	@killall rethinkdb
 
 test-remote:
+	curl -qo ${REMOTE_TEST_SETUP_NAME} ${REMOTE_TEST_SETUP_URL}
 	python ${REMOTE_TEST_SETUP_NAME} pytest -m integration
 
 install-db:
@@ -63,7 +64,7 @@ install-db:
 upload-coverage:
 	@sh scripts/upload-coverage.sh
 
-upload-pypi:
+upload-pypi: prepare
 	@sh scripts/upload-pypi.sh
 
 clean:

README.md

@@ -1,5 +1,5 @@
 # RethinkDB Python driver
-[![Build Status](https://travis-ci.org/rethinkdb/rethinkdb-python.svg?branch=master)](https://travis-ci.org/rethinkdb/rethinkdb-python) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/2b5231a6f90a4a1ba2fc795f8466bbe4)](https://www.codacy.com/app/rethinkdb/rethinkdb-python?utm_source=github.com&utm_medium=referral&utm_content=rethinkdb/rethinkdb-python&utm_campaign=Badge_Grade) [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/2b5231a6f90a4a1ba2fc795f8466bbe4)](https://www.codacy.com/app/rethinkdb/rethinkdb-python?utm_source=github.com&utm_medium=referral&utm_content=rethinkdb/rethinkdb-python&utm_campaign=Badge_Coverage)
+[![PyPI version](https://badge.fury.io/py/rethinkdb.svg)](https://badge.fury.io/py/rethinkdb) [![Build Status](https://travis-ci.org/rethinkdb/rethinkdb-python.svg?branch=master)](https://travis-ci.org/rethinkdb/rethinkdb-python) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/2b5231a6f90a4a1ba2fc795f8466bbe4)](https://www.codacy.com/app/rethinkdb/rethinkdb-python?utm_source=github.com&utm_medium=referral&utm_content=rethinkdb/rethinkdb-python&utm_campaign=Badge_Grade) [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/2b5231a6f90a4a1ba2fc795f8466bbe4)](https://www.codacy.com/app/rethinkdb/rethinkdb-python?utm_source=github.com&utm_medium=referral&utm_content=rethinkdb/rethinkdb-python&utm_campaign=Badge_Coverage)
 
 ## Overview
 
@@ -29,6 +29,7 @@ non-blocking I/O through multiple async frameworks:
 * [Asyncio](https://docs.python.org/3/library/asyncio.html)
 * [Gevent](http://www.gevent.org/)
 * [Tornado](https://www.tornadoweb.org/en/stable/)
+* [Trio](https://trio.readthedocs.io/en/latest/)
 * [Twisted](https://twistedmatrix.com/trac/)
 
 The following examples demonstrate how to use the driver in each mode.
@@ -148,6 +149,45 @@ def main():
 IOLoop.current().run_sync(main)
 ```
 
+### Trio mode
+
+```python
+from rethinkdb import RethinkDB
+import trio
+
+async def main():
+    r = RethinkDB()
+    r.set_loop_type('trio')
+    async with trio.open_nursery() as nursery:
+        async with r.open(db='test', nursery=nursery) as conn:
+            await r.table_create('marvel').run(conn)
+            marvel_heroes = r.table('marvel')
+            await marvel_heroes.insert({
+                'id': 1,
+                'name': 'Iron Man',
+                'first_appearance': 'Tales of Suspense #39'
+            }).run(conn)
+
+            # "async for" is supported in Python ≥ 3.6. In earlier versions, you should
+            # call "await cursor.next()" in a loop.
+            cursor = await marvel_heroes.run(conn)
+            async with cursor:
+                async for hero in cursor:
+                    print(hero['name'])
+
+trio.run(main)
+```
+
+The Trio mode also supports a database connection pool. You can modify the example above
+as follows:
+
+```python
+db_pool = r.ConnectionPool(db='test', nursery=nursery)
+async with db_pool.connection() as conn:
+    ...
+await db_pool.close()
+```
+
 ### Twisted mode
 
 ```python
@@ -212,6 +252,7 @@ Remote test will create a new temporary SSH key and a Droplet for you until the
 | DO_REGION     | sfo2          |
 
 ```bash
+$ pip install paramiko python-digitalocean
 $ export DO_TOKEN=<YOUR_TOKEN>
 $ make test-remote
 ```

requirements.txt

@@ -1,7 +1,5 @@
 codacy-coverage==1.3.11
 mock==2.0.0
 pytest-cov==2.6.1
-pytest==4.1.1
-paramiko==2.4.2
-python-digitalocean==1.13.2
+pytest==4.3.0
 six==1.12.0

rethinkdb/__init__.py

@@ -11,6 +11,9 @@
 # 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.
+import os
+import imp
+import pkg_resources
 
 from rethinkdb import errors, version
 
@@ -30,7 +33,16 @@ class RethinkDB(builtins.object):
     def __init__(self):
         super(RethinkDB, self).__init__()
 
-        from rethinkdb import _dump, _export, _import, _index_rebuild, _restore, ast, query, net
+        from rethinkdb import (
+            _dump,
+            _export,
+            _import,
+            _index_rebuild,
+            _restore,
+            ast,
+            query,
+            net
+        )
 
         self._dump = _dump
         self._export = _export
@@ -43,3 +55,31 @@ def __init__(self):
         for module in (net, query, ast, errors):
             for function_name in module.__all__:
                 setattr(self, function_name, getattr(module, function_name))
+
+        self.set_loop_type(None)
+
+    def set_loop_type(self, library=None):
+        if library is None:
+            self.connection_type = net.DefaultConnection
+            return
+
+        # find module file
+        manager = pkg_resources.ResourceManager()
+        libPath = '%(library)s_net/net_%(library)s.py' % {'library': library}
+        if not manager.resource_exists(__name__, libPath):
+            raise ValueError('Unknown loop type: %r' % library)
+
+        # load the module
+        modulePath = manager.resource_filename(__name__, libPath)
+        moduleName = 'net_%s' % library
+        moduleFile, pathName, desc = imp.find_module(moduleName, [os.path.dirname(modulePath)])
+        module = imp.load_module('rethinkdb.' + moduleName, moduleFile, pathName, desc)
+
+        # set the connection type
+        self.connection_type = module.Connection
+
+        # cleanup
+        manager.cleanup_resources()
+
+    def connect(self, *args, **kwargs):
+        return self.make_connection(self.connection_type, *args, **kwargs)

rethinkdb/asyncio_net/net_asyncio.py

@@ -92,7 +92,6 @@ def __init__(self, *args, **kwargs):
         Cursor.__init__(self, *args, **kwargs)
         self.new_response = asyncio.Future()
 
-    @asyncio.coroutine
     def __aiter__(self):
         return self
 

rethinkdb/logger.py

@@ -35,10 +35,8 @@ def __init__(self, level=logging.INFO):
         """
 
         super(DriverLogger, self).__init__()
-        log_format = '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
-        logging.basicConfig(format=log_format)
 
-        self.logger = logging.getLogger()
+        self.logger = logging.getLogger(__name__)
         self.logger.setLevel(level)
 
         self.write_to_console = False
@@ -65,7 +63,7 @@ def _print_message(self, level, message):
 
     def _log(self, level, message, *args, **kwargs):
         self._print_message(level, message)
-        self.logger.log(level, message, args, kwargs)
+        self.logger.log(level, message, *args, **kwargs)
 
     def debug(self, message):
         """

rethinkdb/net.py

@@ -18,9 +18,7 @@
 
 import collections
 import errno
-import imp
 import numbers
-import os
 import pprint
 import socket
 import ssl
@@ -48,7 +46,7 @@
 from rethinkdb.handshake import HandshakeV1_0
 from rethinkdb.logger import default_logger
 
-__all__ = ['connect', 'set_loop_type', 'Connection', 'Cursor', 'DEFAULT_PORT']
+__all__ = ['Connection', 'Cursor', 'DEFAULT_PORT', 'DefaultConnection', 'make_connection']
 
 
 DEFAULT_PORT = 28015
@@ -705,10 +703,11 @@ def __init__(self, *args, **kwargs):
         Connection.__init__(self, ConnectionInstance, *args, **kwargs)
 
 
-connection_type = DefaultConnection
 
 
-def connect(
+
+def make_connection(
+        connection_type,
         host=None,
         port=None,
         db=None,
@@ -734,26 +733,3 @@ def connect(
 
     conn = connection_type(host, port, db, auth_key, user, password, timeout, ssl, _handshake_version, **kwargs)
     return conn.reconnect(timeout=timeout)
-
-
-def set_loop_type(library):
-    global connection_type
-    import pkg_resources
-
-    # find module file
-    manager = pkg_resources.ResourceManager()
-    libPath = '%(library)s_net/net_%(library)s.py' % {'library': library}
-    if not manager.resource_exists(__name__, libPath):
-        raise ValueError('Unknown loop type: %r' % library)
-
-    # load the module
-    modulePath = manager.resource_filename(__name__, libPath)
-    moduleName = 'net_%s' % library
-    moduleFile, pathName, desc = imp.find_module(moduleName, [os.path.dirname(modulePath)])
-    module = imp.load_module('rethinkdb.' + moduleName, moduleFile, pathName, desc)
-
-    # set the connection type
-    connection_type = module.Connection
-
-    # cleanup
-    manager.cleanup_resources()