diff options
| author | Kali Kaneko <kali@leap.se> | 2015-05-25 16:17:20 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-05-25 16:17:20 -0400 |
| commit | 745ac11c78455e7487bef88da3c3ffeb4fe4351c (patch) | |
| tree | cc14a46120a69921ba9eed6e5584012c23fc694f /client/src/leap/soledad/client/adbapi.py | |
| parent | 340b0dcfbc0a819738a28f9c803fdbf848754897 (diff) | |
| parent | 3e6e51649bb6206125f20ac6773f6744ec8bf175 (diff) | |
Merge remote-tracking branch 'leapcode/pr/216' into develop
this branch includes many changes that improve the asynchronous
retrieval of the sync docs, and the parallel decryption of the encrypted
documents.
Diffstat (limited to 'client/src/leap/soledad/client/adbapi.py')
| -rw-r--r-- | client/src/leap/soledad/client/adbapi.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/src/leap/soledad/client/adbapi.py b/client/src/leap/soledad/client/adbapi.py index 7ad10db5..5b882bbe 100644 --- a/client/src/leap/soledad/client/adbapi.py +++ b/client/src/leap/soledad/client/adbapi.py @@ -32,6 +32,7 @@ from zope.proxy import ProxyBase, setProxiedObject from pysqlcipher.dbapi2 import OperationalError from leap.soledad.client import sqlcipher as soledad_sqlcipher +from leap.soledad.client.pragmas import set_init_pragmas logger = logging.getLogger(name=__name__) @@ -72,7 +73,7 @@ def getConnectionPool(opts, openfun=None, driver="pysqlcipher"): :rtype: U1DBConnectionPool """ if openfun is None and driver == "pysqlcipher": - openfun = partial(soledad_sqlcipher.set_init_pragmas, opts=opts) + openfun = partial(set_init_pragmas, opts=opts) return U1DBConnectionPool( "%s.dbapi2" % driver, database=opts.path, check_same_thread=False, cp_openfun=openfun, |