From 5883fa0d25f74d4cf06f0a8354dd95fe51d2a760 Mon Sep 17 00:00:00 2001 From: Marko Kreen Date: Thu, 29 Dec 2011 11:29:31 +0200 Subject: querybuilder: take type from last ':' this allows ':' in variable name --- python/skytools/querybuilder.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'python/skytools/querybuilder.py') diff --git a/python/skytools/querybuilder.py b/python/skytools/querybuilder.py index 00fe717f..c2eead2d 100755 --- a/python/skytools/querybuilder.py +++ b/python/skytools/querybuilder.py @@ -202,11 +202,12 @@ class QueryBuilder: # get arg name, check if exists k = expr[a1 + 1 : a2] # split name from type - k = k.split(":", 1) - kparam = k[0] - try: - ktype = k[1] - except IndexError: + tpos = k.rfind(':') + if tpos > 0: + kparam = k[:tpos] + ktype = k[tpos+1 : ] + else: + kparam = k ktype = type # params==None means params are checked later -- cgit v1.2.3