Implementing PEP 479 (fixes #3924)

This commit is contained in:
Miroslav Stampar 2019-09-13 11:38:26 +02:00
parent f29c4e1e07
commit ea3de16f24
3 changed files with 3 additions and 3 deletions

View File

@ -18,7 +18,7 @@ from lib.core.enums import OS
from thirdparty.six import unichr as _unichr from thirdparty.six import unichr as _unichr
# sqlmap version (<major>.<minor>.<month>.<monthly commit>) # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
VERSION = "1.3.9.11" VERSION = "1.3.9.12"
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} 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) VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

View File

@ -42,7 +42,7 @@ class Wordlist(six.Iterator):
def adjust(self): def adjust(self):
self.closeFP() self.closeFP()
if self.index > len(self.filenames): if self.index > len(self.filenames):
raise StopIteration return # Note: https://stackoverflow.com/a/30217723 (PEP 479)
elif self.index == len(self.filenames): elif self.index == len(self.filenames):
self.iter = iter(self.custom) self.iter = iter(self.custom)
else: else:

View File

@ -894,7 +894,7 @@ class Tag(PageElement):
def recursiveChildGenerator(self): def recursiveChildGenerator(self):
if not len(self.contents): if not len(self.contents):
raise StopIteration return # Note: https://stackoverflow.com/a/30217723 (PEP 479)
stopNode = self._lastRecursiveChild().next stopNode = self._lastRecursiveChild().next
current = self.contents[0] current = self.contents[0]
while current is not stopNode: while current is not stopNode: