From 0eab35842d33f5e403eaccbe366d3d730ff4cd87 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 22 Oct 2012 22:49:35 -0500 Subject: [PATCH] THREAD_LOCAL folder not reset in dal --- VERSION | 2 +- gluon/dal.py | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/VERSION b/VERSION index 6bbf2868..da4a1fe3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.2.1 (2012-10-22 22:21:06) stable +Version 2.2.1 (2012-10-22 22:49:31) stable diff --git a/gluon/dal.py b/gluon/dal.py index 91f05762..ad6969f0 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -6625,14 +6625,6 @@ class DAL(object): db._db_uid = db_uid return db - @staticmethod - def set_folder(folder): - """ - # ## this allows gluon to set a folder for this thread - # ## <<<<<<<<< Should go away as new DAL replaces old sql.py - """ - BaseAdapter.set_folder(folder) - @staticmethod def distributed_transaction_begin(*instances): if not instances: @@ -6712,8 +6704,6 @@ class DAL(object): credential_decoder = lambda cred: cred else: credential_decoder = lambda cred: urllib.unquote(cred) - if folder: - self.set_folder(folder) self._uri = uri self._pool_size = pool_size self._db_codec = db_codec