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

Author: gabor-boros

.travis.yml

@@ -5,7 +5,6 @@ sudo: required
 
 python:
     - "2.7"
-    - "3.4"
     - "3.5"
     - "3.6"
     - "3.7"

requirements.txt

@@ -1,5 +1,8 @@
 codacy-coverage==1.3.11
 mock==2.0.0
 pytest-cov==2.6.1
-pytest==4.3.1
+pytest==4.4.0
 six==1.12.0
+trio==0.11.0; python_version>="3.6"
+pytest-trio==0.5.2; python_version>="3.6"
+async-generator==1.10; python_version>="3.6"

rethinkdb/trio_net/net_trio.py

@@ -28,7 +28,7 @@
 from rethinkdb.errors import ReqlAuthError, ReqlCursorEmpty, ReqlDriverError, \
     ReqlTimeoutError, RqlCursorEmpty
 from rethinkdb.net import Connection as ConnectionBase, Cursor, Query, \
-    Response, maybe_profile, connect
+    Response, maybe_profile, make_connection
 
 
 __all__ = ['Connection']
@@ -415,7 +415,8 @@ def open(cls, *args, **kwargs):
         return cls(*args, **kwargs)
 
     async def __aenter__(self):
-        self._conn = await connect(*self._args, **self._kwargs)
+        self._conn = await make_connection(Connection, *self._args,
+            **self._kwargs)
         return self._conn
 
     async def __aexit__(self, exc_type, exc, traceback):
@@ -480,7 +481,7 @@ async def acquire(self):
                 # still connected.
                 conn = self._connections.popleft()
         except IndexError:
-            conn = await connect(*self._args, **self._kwargs)
+            conn = await make_connection(*self._args, **self._kwargs)
 
         self._lent_out.add(conn)
         return conn

tests/conftest.py

@@ -4,4 +4,6 @@
 if sys.version_info < (3, 4):
     collect_ignore += ["integration/test_asyncio.py", "integration/test_asyncio_coroutine.py"]
 elif sys.version_info < (3, 6):
-    collect_ignore.append("integration/test_asyncio.py")
+    collect_ignore.append("integration/test_asyncio.py")
+if sys.version_info < (3, 6):
+    collect_ignore.append("integration/test_trio.py")

tests/integration/test_trio.py

@@ -0,0 +1,53 @@
+from collections import namedtuple
+import os
+import sys
+
+from async_generator import async_generator, yield_
+import pytest
+from rethinkdb import RethinkDB
+from rethinkdb.errors import ReqlRuntimeError
+import trio
+
+
+INTEGRATION_TEST_DB = 'integration_test'
+r = RethinkDB()
+r.set_loop_type('trio')
+
+
+@pytest.fixture
+@async_generator
+async def integration_db(nursery):
+    async with r.open(db='test', nursery=nursery) as conn:
+        try:
+            await r.db_create(INTEGRATION_TEST_DB).run(conn)
+        except ReqlRuntimeError:
+            pass
+    await yield_(r.db(INTEGRATION_TEST_DB))
+
+
+@pytest.fixture
+@async_generator
+async def marvel_table(integration_db, nursery):
+    async with r.open(db='test', nursery=nursery) as conn:
+        await r.table_create('marvel').run(conn)
+        await yield_(r.table('marvel'))
+        await r.table_drop('marvel').run(conn)
+
+
+@pytest.mark.trio
+@pytest.mark.integration
+async def test_trio(marvel_table, nursery):
+    """
+    Test the flow for 3.6 and up, async generators are
+    not supported in 3.5.
+    """
+    async with r.open(db='test', nursery=nursery) as conn:
+        await marvel_table.insert({
+            'id': 1,
+            'name': 'Iron Man',
+            'first_appearance': 'Tales of Suspense #39'
+        }).run(conn)
+
+        cursor = await marvel_table.run(conn)
+        async for hero in cursor:
+            hero['name'] == 'Iron Man'