more unicode refactoring

lib/controller/checks.py

@@ -27,6 +27,7 @@ import socket
 import time
 
 from lib.core.agent import agent
+from lib.core.common import getUnicode
 from lib.core.common import randomInt
 from lib.core.common import randomStr
 from lib.core.convert import md5hash
@@ -257,7 +258,7 @@ def checkDynParam(place, parameter, value):
     logger.info(infoMsg)
 
     randInt = randomInt()
-    payload = agent.payload(place, parameter, value, unicode(randInt))
+    payload = agent.payload(place, parameter, value, getUnicode(randInt))
     dynResult1 = Request.queryPage(payload, place)
 
     if True == dynResult1:
@@ -395,7 +396,7 @@ def checkConnection():
         conf.seqMatcher.set_seq1(page)
 
     except sqlmapConnectionException, errMsg:
-        errMsg = unicode(errMsg)
+        errMsg = getUnicode(errMsg)
         raise sqlmapConnectionException, errMsg
 
     return True

lib/controller/controller.py

@@ -29,6 +29,7 @@ from lib.controller.checks import checkStability
 from lib.controller.checks import checkString
 from lib.controller.checks import checkRegexp
 from lib.controller.checks import checkConnection
+from lib.core.common import getUnicode
 from lib.core.common import paramToDict
 from lib.core.common import parseTargetUrl
 from lib.core.common import readInput
@@ -155,7 +156,7 @@ def start():
 
             if not conf.dropSetCookie:
                 for _, cookie in enumerate(conf.cj):
-                    cookie = unicode(cookie)
+                    cookie = getUnicode(cookie)
                     index  = cookie.index(" for ")
 
                     cookieStr += "%s;" % cookie[8:index]
@@ -267,7 +268,7 @@ def start():
                     action()
 
         except exceptionsTuple, e:
-            e = unicode(e)
+            e = getUnicode(e)
 
             if conf.multipleTargets:
                 e += ", skipping to next url"