From 7776a22533f4c84666b240c26e5197203567dca0 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 10 Mar 2013 07:54:44 -0500 Subject: [PATCH] fixed Ingres constr typo, thanks Chris Clark --- VERSION | 2 +- applications/examples/controllers/global.py | 2 ++ gluon/dal.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 2f14e5bf..32427eb7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.2-stable+timestamp.2013.03.09.09.35.34 +Version 2.4.2-stable+timestamp.2013.03.10.07.53.59 diff --git a/applications/examples/controllers/global.py b/applications/examples/controllers/global.py index f1571c4d..eaf16d21 100644 --- a/applications/examples/controllers/global.py +++ b/applications/examples/controllers/global.py @@ -5,6 +5,8 @@ response.menu = [['home', False, '/%s/default/index' '/%s/global/vars' % request.application]] def get(args): + if args[0].startswith('__'): + return None try: obj = globals(),get(args[0]) for k in range(1,len(args)): diff --git a/gluon/dal.py b/gluon/dal.py index 06083b31..dc65282a 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -3920,7 +3920,7 @@ class IngresAdapter(BaseAdapter): self.db_codec = db_codec self._after_connection = after_connection self.find_or_make_work_folder() - connstr = self._uri.split(':', 1)[1] + connstr = uri.split(':', 1)[1] # Simple URI processing connstr = connstr.lstrip() while connstr.startswith('/'):