Fixes #2060 (ParseError has been added in Python 2.7)

This commit is contained in:
Miroslav Stampar 2016-07-23 15:27:25 +02:00
parent 7cca56edfa
commit 9105f259cd
3 changed files with 4 additions and 4 deletions

View File

@ -19,7 +19,7 @@ from lib.core.enums import OS
from lib.core.revision import getRevisionNumber from lib.core.revision import getRevisionNumber
# sqlmap version (<major>.<minor>.<month>.<monthly commit>) # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
VERSION = "1.0.7.38" VERSION = "1.0.7.39"
REVISION = getRevisionNumber() REVISION = getRevisionNumber()
STABLE = VERSION.count('.') <= 2 STABLE = VERSION.count('.') <= 2
VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev") VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev")

View File

@ -132,7 +132,7 @@ def _oneShotUnionUse(expression, unpack=True, limited=False):
row.append(child.attrib.get(column, NULL)) row.append(child.attrib.get(column, NULL))
retVal += "%s%s%s" % (kb.chars.start, kb.chars.delimiter.join(row), kb.chars.stop) retVal += "%s%s%s" % (kb.chars.start, kb.chars.delimiter.join(row), kb.chars.stop)
except xml.etree.ElementTree.ParseError: except:
pass pass
else: else:
retVal = getUnicode(retVal) retVal = getUnicode(retVal)

View File

@ -45,7 +45,7 @@ e60456db5380840a586654344003d4e6 lib/core/readlineng.py
5ef56abb8671c2ca6ceecb208258e360 lib/core/replication.py 5ef56abb8671c2ca6ceecb208258e360 lib/core/replication.py
99a2b496b9d5b546b335653ca801153f lib/core/revision.py 99a2b496b9d5b546b335653ca801153f lib/core/revision.py
7c15dd2777af4dac2c89cab6df17462e lib/core/session.py 7c15dd2777af4dac2c89cab6df17462e lib/core/session.py
97d3d003cad815f9119e4757abd3a70e lib/core/settings.py b10a550bac6290cc73312c413c39506a lib/core/settings.py
7af83e4f18cab6dff5e67840eb65be80 lib/core/shell.py 7af83e4f18cab6dff5e67840eb65be80 lib/core/shell.py
23657cd7d924e3c6d225719865855827 lib/core/subprocessng.py 23657cd7d924e3c6d225719865855827 lib/core/subprocessng.py
0bc2fae1dec18cdd11954b22358293f2 lib/core/target.py 0bc2fae1dec18cdd11954b22358293f2 lib/core/target.py
@ -99,7 +99,7 @@ cc9c82cfffd8ee9b25ba3af6284f057e lib/techniques/error/__init__.py
cc9c82cfffd8ee9b25ba3af6284f057e lib/techniques/__init__.py cc9c82cfffd8ee9b25ba3af6284f057e lib/techniques/__init__.py
cc9c82cfffd8ee9b25ba3af6284f057e lib/techniques/union/__init__.py cc9c82cfffd8ee9b25ba3af6284f057e lib/techniques/union/__init__.py
f5d6884cdeed28281187c111d3e49e3b lib/techniques/union/test.py f5d6884cdeed28281187c111d3e49e3b lib/techniques/union/test.py
395d966e394a11e45be50dfa8f01961b lib/techniques/union/use.py 12ce1bb7ee5f1f23f58be12fe9fa8472 lib/techniques/union/use.py
2dfc03a7322c46deb2e5353a7fd4be5e lib/utils/api.py 2dfc03a7322c46deb2e5353a7fd4be5e lib/utils/api.py
8cdc8c1e663c3b92a756fb7b02cc3c02 lib/utils/crawler.py 8cdc8c1e663c3b92a756fb7b02cc3c02 lib/utils/crawler.py
393f8fd1684308213e1d2e6a9d4258c2 lib/utils/deps.py 393f8fd1684308213e1d2e6a9d4258c2 lib/utils/deps.py