CERBERUS/sqlmap
1
0
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2026-08-04 06:50:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

str() -> unicode()

Browse source
This commit is contained in:
Miroslav Stampar 2010-05-28 13:05:02 +00:00
parent f24187f251
commit a3db3c03c1
17 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/core/common.py
View file

@ -451,7 +451,7 @@ def readInput(message, default=None):
message += "\n> "
if conf.batch and default:
infoMsg = "%s%s" % (message, str(default))
infoMsg = "%s%s" % (message, unicode(default))
logger.info(infoMsg)
debugMsg = "used the default behaviour, running in batch mode"
@ -517,7 +517,7 @@ def sanitizeStr(inpStr):
@rtype: C{str}
"""
cleanString = str(inpStr)
cleanString = unicode(inpStr)
cleanString = cleanString.replace("\n", " ").replace("\r", "")
return cleanString
@ -638,8 +638,8 @@ def parseTargetDirect():
conf.dbmsUser = details.group('user')
conf.dbmsPass = details.group('pass')
else:
conf.dbmsUser = str()
conf.dbmsPass = str()
conf.dbmsUser = unicode()
conf.dbmsPass = unicode()
if not conf.dbmsPass:
conf.dbmsPass = None
@ -1032,7 +1032,7 @@ def safeStringFormat(formatStr, params):
if index != -1:
if count < len(params):
retVal = retVal[:index] + str(params[count]) + retVal[index+2:]
retVal = retVal[:index] + unicode(params[count]) + retVal[index+2:]
else:
raise sqlmapNoneDataException, "wrong number of parameters during string formatting"
count += 1
@ -1107,7 +1107,7 @@ def profile(profileOutputFile=None, dotOutputFile=None, imageOutputFile=None):
import gtk
import pydot
except ImportError, e:
errMsg = "profiling requires third-party libraries (%s)" % str(e)
errMsg = "profiling requires third-party libraries (%s)" % unicode(e)
logger.error(errMsg)
return
@ -1343,7 +1343,7 @@ def getCommonStart(strings=[]):
if len(strings) == 1:
return strings[0]
retVal = str()
retVal = unicode()
maxCount = min(len(string) for string in strings)
count = 0