Minor bug fix: there will always be only one pair of delimiters as we add it for each place

bdamele · bdamele · commit 6afc9bffaa6e · 2010-10-31T11:09:29.000Z
diff --git a/lib/core/agent.py b/lib/core/agent.py
@@ -623,13 +623,10 @@ def removePayloadDelimiters(self, inpStr, urlencode_=True):
         retVal = inpStr
 
         if inpStr:
-            if urlencode_:
-                regObj = getCompiledRegex("(?P<result>%s.*?%s)" % (PAYLOAD_DELIMITER, PAYLOAD_DELIMITER))
+            retVal = retVal.replace(PAYLOAD_DELIMITER, '')
 
-                for match in regObj.finditer(inpStr):
-                    retVal = retVal.replace(match.group("result"), urlencode(match.group("result")[1:-1], convall=True))
-            else:
-                retVal = retVal.replace(PAYLOAD_DELIMITER, '')
+            if urlencode_:
+                retVal = urlencode(retVal)
 
         return retVal
 
