Skip to content

Commit b036fcc

Browse files
committed
Junk removal (in preparing for py3)
1 parent 7356293 commit b036fcc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+31
-404
lines changed

extra/sqlharvest/__init__.py

Lines changed: 0 additions & 8 deletions
This file was deleted.

extra/sqlharvest/sqlharvest.py

Lines changed: 0 additions & 143 deletions
This file was deleted.

lib/core/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from lib.core.enums import OS
1818

1919
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
20-
VERSION = "1.3.3.63"
20+
VERSION = "1.3.3.64"
2121
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
2222
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
2323
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

plugins/dbms/access/__init__.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@ class AccessMap(Syntax, Fingerprint, Enumeration, Filesystem, Miscellaneous, Tak
2323
def __init__(self):
2424
self.excludeDbsList = ACCESS_SYSTEM_DBS
2525

26-
Syntax.__init__(self)
27-
Fingerprint.__init__(self)
28-
Enumeration.__init__(self)
29-
Filesystem.__init__(self)
30-
Miscellaneous.__init__(self)
31-
Takeover.__init__(self)
26+
for cls in self.__class__.__bases__:
27+
cls.__init__(self)
3228

3329
unescaper[DBMS.ACCESS] = Syntax.escape

plugins/dbms/access/connector.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ class Connector(GenericConnector):
2929
License: MIT
3030
"""
3131

32-
def __init__(self):
33-
GenericConnector.__init__(self)
34-
3532
def connect(self):
3633
if not IS_WIN:
3734
errMsg = "currently, direct connection to Microsoft Access database(s) "

plugins/dbms/access/enumeration.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
from plugins.generic.enumeration import Enumeration as GenericEnumeration
1010

1111
class Enumeration(GenericEnumeration):
12-
def __init__(self):
13-
GenericEnumeration.__init__(self)
14-
1512
def getBanner(self):
1613
warnMsg = "on Microsoft Access it is not possible to get a banner"
1714
logger.warn(warnMsg)

plugins/dbms/access/filesystem.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
from plugins.generic.filesystem import Filesystem as GenericFilesystem
1010

1111
class Filesystem(GenericFilesystem):
12-
def __init__(self):
13-
GenericFilesystem.__init__(self)
14-
1512
def readFile(self, rFile):
1613
errMsg = "on Microsoft Access it is not possible to read files"
1714
raise SqlmapUnsupportedFeatureException(errMsg)

plugins/dbms/access/syntax.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
from plugins.generic.syntax import Syntax as GenericSyntax
99

1010
class Syntax(GenericSyntax):
11-
def __init__(self):
12-
GenericSyntax.__init__(self)
13-
1411
@staticmethod
1512
def escape(expression, quote=True):
1613
def escaper(value):

plugins/dbms/access/takeover.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
from plugins.generic.takeover import Takeover as GenericTakeover
1010

1111
class Takeover(GenericTakeover):
12-
def __init__(self):
13-
GenericTakeover.__init__(self)
14-
1512
def osCmd(self):
1613
errMsg = "on Microsoft Access it is not possible to execute commands"
1714
raise SqlmapUnsupportedFeatureException(errMsg)

plugins/dbms/db2/__init__.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,7 @@ class DB2Map(Syntax, Fingerprint, Enumeration, Filesystem, Miscellaneous, Takeov
2424
def __init__(self):
2525
self.excludeDbsList = DB2_SYSTEM_DBS
2626

27-
Syntax.__init__(self)
28-
Fingerprint.__init__(self)
29-
Enumeration.__init__(self)
30-
Filesystem.__init__(self)
31-
Miscellaneous.__init__(self)
32-
Takeover.__init__(self)
27+
for cls in self.__class__.__bases__:
28+
cls.__init__(self)
3329

3430
unescaper[DBMS.DB2] = Syntax.escape

0 commit comments

Comments
 (0)