From 58ad2f1c5deee536d4e5f4b7ae20f4ed8469b5e2 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Sat, 29 Dec 2012 10:35:05 +0100 Subject: [PATCH] Revert of last commit and proper fix --- lib/techniques/union/use.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/techniques/union/use.py b/lib/techniques/union/use.py index d5eb74c4a..c047e92c4 100644 --- a/lib/techniques/union/use.py +++ b/lib/techniques/union/use.py @@ -31,6 +31,7 @@ from lib.core.common import parseUnionPage from lib.core.common import removeReflectiveValues from lib.core.common import singleTimeDebugMessage from lib.core.common import singleTimeWarnMessage +from lib.core.common import unArrayizeValue from lib.core.common import wasLastRequestDBMSError from lib.core.convert import htmlunescape from lib.core.data import conf @@ -86,7 +87,7 @@ def _oneShotUnionUse(expression, unpack=True, limited=False): singleTimeWarnMessage(warnMsg) page = page.replace(kb.chars.stop[:-1], kb.chars.stop) - retVal = _("(?P%s.*?%s)" % (kb.chars.start, kb.chars.stop)) + retVal = _("(?P%s.*%s)" % (kb.chars.start, kb.chars.stop)) if retVal is not None: retVal = getUnicode(retVal, kb.pageEncoding) @@ -189,7 +190,7 @@ def unionUse(expression, unpack=True, dump=False): countedExpression = countedExpression[:_] output = _oneShotUnionUse(countedExpression, unpack) - count = parseUnionPage(output) + count = unArrayizeValue(parseUnionPage(output)) if isNumPosStrValue(count): if isinstance(stopLimit, int) and stopLimit > 0: