Introducing 'new style classes' (idea from Pull request #284)

stamparm · stamparm · commit b6650add4690 · 2012-12-06T10:42:53.000+01:00
diff --git a/lib/core/agent.py b/lib/core/agent.py
@@ -34,7 +34,7 @@
 from lib.core.settings import PAYLOAD_DELIMITER
 from lib.core.unescaper import unescaper
 
-class Agent:
+class Agent(object):
     """
     This class defines the SQL agent methods.
     """
diff --git a/lib/core/bigarray.py b/lib/core/bigarray.py
@@ -11,7 +11,7 @@
 
 from lib.core.settings import BIGARRAY_CHUNK_LENGTH
 
-class Cache:
+class Cache(object):
     """
     Auxiliary class used for storing cached chunks
     """
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -168,7 +168,7 @@ def write(self, fp):
 
             fp.write("\n")
 
-class Format:
+class Format(object):
     @staticmethod
     def humanize(values, chain=" or "):
         return chain.join(values)
@@ -2824,7 +2824,7 @@ def expandMnemonics(mnemonics, parser, args):
     Expands mnemonic options
     """
 
-    class MnemonicNode:
+    class MnemonicNode(object):
         def __init__(self):
             self.next = {}
             self.current = []
diff --git a/lib/core/dump.py b/lib/core/dump.py
@@ -37,7 +37,7 @@
 from lib.core.settings import TRIM_STDOUT_DUMP_SIZE
 from lib.core.settings import UNICODE_ENCODING
 
-class Dump:
+class Dump(object):
     """
     This class defines methods used to parse and output the results
     of SQL injection actions
diff --git a/lib/core/progress.py b/lib/core/progress.py
@@ -9,7 +9,7 @@
 from lib.core.common import dataToStdout
 from lib.core.data import conf
 
-class ProgressBar:
+class ProgressBar(object):
     """
     This class defines methods to update and draw a progress bar
     """
diff --git a/lib/core/replication.py b/lib/core/replication.py
@@ -13,7 +13,7 @@
 from lib.core.exception import sqlmapMissingDependence
 from lib.core.exception import sqlmapValueException
 
-class Replication:
+class Replication(object):
     """
     This class holds all methods/classes used for database
     replication purposes.
diff --git a/lib/core/wordlist.py b/lib/core/wordlist.py
@@ -11,7 +11,7 @@
 from lib.core.exception import sqlmapDataException
 from lib.core.settings import UNICODE_ENCODING
 
-class Wordlist:
+class Wordlist(object):
     """
     Iterator for looping over a large dictionaries
     """
diff --git a/lib/core/xmldump.py b/lib/core/xmldump.py
@@ -74,7 +74,7 @@
 CHARACTERS_TO_ENCODE = range(32) + range(127, 256)
 ENTITIES = {'"': '&quot;', "'": "&apos;"}
 
-class XMLDump:
+class XMLDump(object):
     '''
     This class purpose is to dump the data into an xml Format.
     The format of the xml file is described in the scheme file xml/sqlmap.xsd
diff --git a/lib/request/connect.py b/lib/request/connect.py
@@ -81,7 +81,7 @@
 from thirdparty.multipart import multipartpost
 
 
-class Connect:
+class Connect(object):
     """
     This class defines methods used to perform HTTP requests
     """
diff --git a/lib/request/dns.py b/lib/request/dns.py
@@ -12,7 +12,7 @@
 import threading
 import time
 
-class DNSQuery:
+class DNSQuery(object):
     """
     Used for making fake DNS resolution responses based on received
     raw request
@@ -58,7 +58,7 @@ def response(self, resolution):
 
         return retVal
 
-class DNSServer:
+class DNSServer(object):
     def __init__(self):
         self._requests = []
         self._lock = threading.Lock()
diff --git a/lib/utils/crawler.py b/lib/utils/crawler.py
@@ -25,7 +25,7 @@
 from thirdparty.beautifulsoup.beautifulsoup import BeautifulSoup
 from thirdparty.oset.pyoset import oset
 
-class Crawler:
+class Crawler(object):
     """
     This class defines methods used to perform crawling (command
     line option '--crawl'
diff --git a/lib/utils/getch.py b/lib/utils/getch.py
@@ -5,7 +5,7 @@
 See the file 'doc/COPYING' for copying permission
 """
 
-class _Getch:
+class _Getch(object):
     """
     Gets a single character from standard input.  Does not echo to
     the screen (reference: http://code.activestate.com/recipes/134892/)
@@ -22,7 +22,7 @@ def __init__(self):
     def __call__(self): return self.impl()
 
 
-class _GetchUnix:
+class _GetchUnix(object):
     def __init__(self):
         import tty
 
@@ -38,7 +38,7 @@ def __call__(self):
         return ch
 
 
-class _GetchWindows:
+class _GetchWindows(object):
     def __init__(self):
         import msvcrt
 
@@ -47,7 +47,7 @@ def __call__(self):
         return msvcrt.getch()
 
 
-class _GetchMacCarbon:
+class _GetchMacCarbon(object):
     """
     A function which returns the current ASCII key that is down;
     if no ASCII key is down, the null string is returned.  The
diff --git a/lib/utils/google.py b/lib/utils/google.py
@@ -26,7 +26,7 @@
 from lib.core.settings import URI_INJECTABLE_REGEX
 from lib.request.basic import decodePage
 
-class Google:
+class Google(object):
     """
     This class defines methods used to perform Google dorking (command
     line option '-g <google dork>'
