From cda00c7501d772f8634593b6ee6986cf9fcf5792 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Wed, 15 Dec 2010 12:43:56 +0000 Subject: [PATCH] code refactoring --- lib/request/inject.py | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/lib/request/inject.py b/lib/request/inject.py index 42495a115..cabfe7cc8 100644 --- a/lib/request/inject.py +++ b/lib/request/inject.py @@ -112,7 +112,7 @@ def __goBooleanProxy(expression, resumeValue=True): output = resume(expression, payload) else: output = None - + if not output: output = Request.queryPage(payload) @@ -343,12 +343,7 @@ def __goError(expression, resumeValue=True): if conf.direct: return direct(expression), None - condition = ( - kb.resumedQueries and conf.url in kb.resumedQueries.keys() - and expression in kb.resumedQueries[conf.url].keys() - ) - - if condition and resumeValue: + if resumeValue: result = resume(expression, None) if not result: @@ -367,12 +362,7 @@ def __goInband(expression, expected=None, sort=True, resumeValue=True, unpack=Tr partial = False data = [] - condition = ( - kb.resumedQueries and conf.url in kb.resumedQueries.keys() - and expression in kb.resumedQueries[conf.url].keys() - ) - - if condition and resumeValue: + if resumeValue: output = resume(expression, None) if not output or ( expected == EXPECTED.INT and not output.isdigit() ):