From 7ddb8f7cbe623073793b38c40e629a6f25379869 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Thu, 9 May 2019 13:48:44 +0200 Subject: [PATCH] Another Travis patch --- lib/core/settings.py | 2 +- lib/utils/sgmllib.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index 9ba8d66dc..15738386e 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -18,7 +18,7 @@ from lib.core.enums import OS from thirdparty import six # sqlmap version (...) -VERSION = "1.3.5.67" +VERSION = "1.3.5.68" 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) diff --git a/lib/utils/sgmllib.py b/lib/utils/sgmllib.py index c69e08996..ac0308907 100644 --- a/lib/utils/sgmllib.py +++ b/lib/utils/sgmllib.py @@ -12,7 +12,11 @@ from __future__ import print_function -import _markupbase +try: + import _markupbase as markupbase +except: + import markupbase + import re __all__ = ["SGMLParser", "SGMLParseError"] @@ -55,7 +59,7 @@ class SGMLParseError(RuntimeError): # chunks). Entity references are passed by calling # self.handle_entityref() with the entity reference as argument. -class SGMLParser(_markupbase.ParserBase): +class SGMLParser(markupbase.ParserBase): # Definition of entities -- derived classes may override entity_or_charref = re.compile('&(?:' '([a-zA-Z][-.a-zA-Z0-9]*)|#([0-9]+)' @@ -74,7 +78,7 @@ class SGMLParser(_markupbase.ParserBase): self.lasttag = '???' self.nomoretags = 0 self.literal = 0 - _markupbase.ParserBase.reset(self) + markupbase.ParserBase.reset(self) def setnomoretags(self): """Enter literal mode (CDATA) till EOF.