@@ -422,7 +422,7 @@ def comp(N, url):
 def fetch(N, url, delay=0):
     lens = []
     starttime = time.time()
-    for i in range(N):
+    for i in xrange(N):
         if delay and i > 0: time.sleep(delay)
         fo = urllib2.urlopen(url)
         foo = fo.read()
 
@@ -562,7 +562,7 @@ def forgeInbandQuery(self, query, position, count, comment, prefix, suffix, char
         inbandQuery = self.prefixQuery("UNION ALL SELECT ", prefix=prefix)
 
         if limited:
-            inbandQuery += ",".join(map(lambda x: char if x != position else '(SELECT %s)' % query, range(0, count)))
+            inbandQuery += ",".join(map(lambda x: char if x != position else '(SELECT %s)' % query, xrange(0, count)))
             inbandQuery += FROM_TABLE.get(Backend.getIdentifiedDbms(), "")
             inbandQuery = self.suffixQuery(inbandQuery, comment, suffix)
 
@@ -583,7 +583,7 @@ def forgeInbandQuery(self, query, position, count, comment, prefix, suffix, char
         if Backend.getIdentifiedDbms() in FROM_TABLE and inbandQuery.endswith(FROM_TABLE[Backend.getIdentifiedDbms()]):
             inbandQuery = inbandQuery[:-len(FROM_TABLE[Backend.getIdentifiedDbms()])]
 
-        for element in range(0, count):
+        for element in xrange(0, count):
             if element > 0:
                 inbandQuery += ", "
 
@@ -610,7 +610,7 @@ def forgeInbandQuery(self, query, position, count, comment, prefix, suffix, char
         if multipleUnions:
             inbandQuery += " UNION ALL SELECT "
 
-            for element in range(count):
+            for element in xrange(count):
                 if element > 0:
                     inbandQuery += ", "
 
 
@@ -2817,7 +2817,7 @@ def safeSQLIdentificatorNaming(name, isTable=False):
 
         parts = name.split('.')
 
-        for i in range(len(parts)):
+        for i in xrange(len(parts)):
             if not re.match(r"\A[A-Za-z0-9_]+\Z", parts[i]):
                 if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.ACCESS):
                     parts[i] = "`%s`" % parts[i].strip("`")
 
@@ -414,7 +414,7 @@ def dbTableValues(self, tableValues):
             warnMsg += "due to the large table size"
             logger.warning(warnMsg)
 
-        for i in range(count):
+        for i in xrange(count):
             console = (i >= count - TRIM_STDOUT_DUMP_SIZE)
             field = 1
             values = []
 
@@ -111,10 +111,10 @@ def __setRequestParams():
         conf.paramDict[PLACE.URI] = {}
         parts = conf.url.split(URI_INJECTION_MARK_CHAR)
 
-        for i in range(len(parts)-1):
+        for i in xrange(len(parts)-1):
             result = str()
 
-            for j in range(len(parts)):
+            for j in xrange(len(parts)):
                 result += parts[j]
 
                 if i == j:
 
@@ -110,7 +110,7 @@ def runThreads(numThreads, threadFunction, cleanupFunction=None, forwardExceptio
             return
 
         # Start the threads
-        for numThread in range(numThreads):
+        for numThread in xrange(numThreads):
             thread = threading.Thread(target=exceptionHandledFunction, name=str(numThread), args=[threadFunction])
 
             # Reference: http://stackoverflow.com/questions/190010/daemon-threads-explanation
 
@@ -107,7 +107,7 @@ def __orderByTest(cols):
     min_, max_ = MAX_RATIO, MIN_RATIO
     pages = {}
 
-    for count in range(lowerCount, upperCount+1):
+    for count in xrange(lowerCount, upperCount+1):
         query = agent.forgeInbandQuery('', -1, count, comment, prefix, suffix, kb.uChar)
         payload = agent.payload(place=place, parameter=parameter, newValue=query, where=where)
         page, headers = Request.queryPage(payload, place=place, content=True, raise404=False)
 
@@ -303,7 +303,7 @@ def attackDumpedTable():
             results = dictionaryAttack(attack_dict)
 
             for (user, hash_, password) in results:
-                for i in range(count):
+                for i in xrange(count):
                     for column in columns:
                         if column == colUser or column == '__infos__':
                             continue
 
@@ -33,7 +33,7 @@ def unescape(expression, quote=True):
                 old = "'%s'" % expression[firstIndex:lastIndex]
                 unescaped = ""
 
-                for i in range(firstIndex, lastIndex):
+                for i in xrange(firstIndex, lastIndex):
                     unescaped += "CHR(%d)" % (ord(expression[i]))
                     if i < lastIndex - 1:
                         unescaped += "&"
 
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 """
-$Id$
+$Id$
 
 Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
@@ -34,7 +34,7 @@ def unescape(expression, quote=True):
                 old = "'%s'" % expression[firstIndex:lastIndex]
                 unescaped = ""
 
-                for i in range(firstIndex, lastIndex):
+                for i in xrange(firstIndex, lastIndex):
                     unescaped += "CHR(%d)" % (ord(expression[i]))
                     if i < lastIndex - 1:
                         unescaped += "||"