Skip to content

Commit

Permalink
Further pleasing pylint gods
Browse files Browse the repository at this point in the history
  • Loading branch information
stamparm committed Jun 1, 2019
1 parent f9fe1dd commit a6b6b91
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

# Python code to execute, usually for sys.path manipulation such as
# pygtk.require().
init-hook=
init-hook="from pylint.config import find_pylintrc; import os, sys; sys.path.append(os.path.dirname(find_pylintrc()))"

# Add files or directories to the blacklist. They should be base names, not
# paths.
Expand Down Expand Up @@ -306,7 +306,7 @@ ignore-mixin-members=yes
# (useful for modules/projects where namespaces are manipulated during runtime
# and thus existing member attributes cannot be deduced by static analysis. It
# supports qualified module names, as well as Unix pattern matching.
ignored-modules=
ignored-modules=thirdparty.six.moves

# List of classes names for which member attributes should not be checked
# (useful for classes with attributes dynamically set). This supports can work
Expand Down
6 changes: 3 additions & 3 deletions lib/core/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -1476,7 +1476,7 @@ def parseTargetDirect():

if dbmsName in (DBMS.MSSQL, DBMS.SYBASE):
__import__("_mssql")
import pymssql
pymssql = __import__("pymssql")

if not hasattr(pymssql, "__version__") or pymssql.__version__ < "1.0.2":
errMsg = "'%s' third-party library must be " % data[1]
Expand Down Expand Up @@ -4316,9 +4316,9 @@ def findPageForms(content, url, raise_=False, addToTargets=False):
True
"""

class _(six.StringIO):
class _(six.StringIO, object):
def __init__(self, content, url):
six.StringIO.__init__(self, content)
super(_, self).__init__(content)
self._url = url

def geturl(self):
Expand Down
2 changes: 1 addition & 1 deletion lib/core/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from thirdparty.six import unichr as _unichr

# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
VERSION = "1.3.6.3"
VERSION = "1.3.6.4"
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
Expand Down
4 changes: 2 additions & 2 deletions lib/core/threads.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ def reset(self):
self.lastComparisonHeaders = None
self.lastComparisonCode = None
self.lastComparisonRatio = None
self.lastErrorPage = None
self.lastErrorPage = tuple()
self.lastHTTPError = None
self.lastRedirectMsg = None
self.lastQueryDuration = 0
self.lastPage = None
self.lastRequestMsg = None
self.lastRequestUID = 0
self.lastRedirectURL = None
self.lastRedirectURL = tuple()
self.random = WichmannHill()
self.resumed = False
self.retriesCount = 0
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def checkDependencies():
if dbmsName in (DBMS.MSSQL, DBMS.SYBASE):
__import__("_mssql")

import pymssql
pymssql = __import__("pymssql")
if not hasattr(pymssql, "__version__") or pymssql.__version__ < "1.0.2":
warnMsg = "'%s' third-party library must be " % data[1]
warnMsg += "version >= 1.0.2 to work properly. "
Expand Down

0 comments on commit a6b6b91

Please sign in to comment.