removed all trailing spaces from blank lines

This commit is contained in:
Miroslav Stampar
2010-11-03 10:08:27 +00:00
parent 977df7276d
commit 6adee3792a
29 changed files with 121 additions and 122 deletions

View File

@@ -313,7 +313,7 @@ class Agent:
fieldsToCastStr = fieldsSelect.groups()[0]
elif fieldsNoSelect:
fieldsToCastStr = fieldsNoSelect
if re.search("\A\w+\(.*\)", fieldsToCastStr, re.I): #function
fieldsToCastList = [fieldsToCastStr]
else:
@@ -531,7 +531,7 @@ class Agent:
if kb.dbms in ( DBMS.MYSQL, DBMS.POSTGRESQL, DBMS.SQLITE ):
limitStr = queries[kb.dbms].limit.query % (num, 1)
limitedQuery += " %s" % limitStr
elif kb.dbms == DBMS.FIREBIRD:
limitStr = queries[kb.dbms].limit.query % (num+1, num+1)
limitedQuery += " %s" % limitStr

View File

@@ -1256,7 +1256,7 @@ def readCachedFileContent(filename, mode='rb'):
xfile.close()
kb.locks.cacheLock.release()
return kb.cache.content[filename]
def readXmlFile(xmlFile):

View File

@@ -39,7 +39,7 @@ def hexdecode(string):
string = string[2:]
return string.decode("hex")
def hexencode(string):
return string.encode("hex")

View File

@@ -611,7 +611,7 @@ def __setHTTPProxy():
errMsg = "Proxy authentication credentials "
errMsg += "value must be in format username:password"
raise sqlmapSyntaxException, errMsg
# Reference: http://stackoverflow.com/questions/34079/how-to-specify-an-authenticated-proxy-for-a-python-http-connection
__proxyString = "%s@" % conf.pCred

View File

@@ -89,4 +89,3 @@ class Replication:
def __del__(self):
self.cursor.close()
self.connection.close()

View File

@@ -180,13 +180,13 @@ def __setOutputResume():
continue
url, _, _, expression, value = line
if not value:
continue
if url[0] == "[":
url = url[1:]
value = value.rstrip('\r\n') # Strips both chars independently
if url not in ( conf.url, conf.hostname ):
@@ -197,9 +197,9 @@ def __setOutputResume():
kb.resumedQueries[url][expression] = value
__url_cache.add(url)
__expression_cache[url] = set(expression)
resumeConfKb(expression, url, value)
if expression not in __expression_cache[url]:
kb.resumedQueries[url][expression] = value
__expression_cache[url].add(value)