From 4af6227aa90eaac536b8cb5eaf2fcabb22e28508 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 13 Aug 2012 13:29:59 -0500 Subject: [PATCH] os.sep in DAL, thanks Jonathan --- VERSION | 2 +- gluon/dal.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index a1d9ea7f..ec7106fa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-08-13 11:02:40) dev +Version 2.00.0 (2012-08-13 13:29:54) dev diff --git a/gluon/dal.py b/gluon/dal.py index ac6d957d..042541ce 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -3866,7 +3866,8 @@ class GoogleSQLAdapter(UseDatabaseStoredFile,MySQLAdapter): self.pool_size = pool_size self.folder = folder self.db_codec = db_codec - self.folder = folder or '$HOME/'+thread.folder.split('/applications/',1)[1] + self.folder = folder or '$HOME'+os.sep+thread.folder.split( + os.sep+'applications'+os.sep,1)[1] m = re.compile('^(?P.*)/(?P.*)$').match(self.uri[len('google:sql://'):]) if not m: