conf.unescape->kb.unescape

This commit is contained in:
Miroslav Stampar 2012-07-10 10:55:04 +02:00
parent e7f78bf04f
commit 8caffac4bc
3 changed files with 5 additions and 5 deletions

View File

@ -1402,7 +1402,6 @@ def __setConfAttributes():
conf.tests = [] conf.tests = []
conf.trafficFP = None conf.trafficFP = None
conf.wFileType = None conf.wFileType = None
conf.unescape = True
def __setKnowledgeBaseAttributes(flushAll=True): def __setKnowledgeBaseAttributes(flushAll=True):
""" """
@ -1518,6 +1517,7 @@ def __setKnowledgeBaseAttributes(flushAll=True):
kb.threadException = False kb.threadException = False
kb.timeValidCharsRun = 0 kb.timeValidCharsRun = 0
kb.uChar = NULL kb.uChar = NULL
kb.unescape = True
kb.unionDuplicates = False kb.unionDuplicates = False
kb.xpCmdshellAvailable = False kb.xpCmdshellAvailable = False

View File

@ -6,13 +6,13 @@ See the file 'doc/COPYING' for copying permission
""" """
from lib.core.common import Backend from lib.core.common import Backend
from lib.core.data import conf from lib.core.data import kb
from lib.core.datatype import AttribDict from lib.core.datatype import AttribDict
from lib.core.settings import EXCLUDE_UNESCAPE from lib.core.settings import EXCLUDE_UNESCAPE
class Unescaper(AttribDict): class Unescaper(AttribDict):
def unescape(self, expression, quote=True, dbms=None): def unescape(self, expression, quote=True, dbms=None):
if not conf.unescape: if not kb.unescape:
return expression return expression
if expression is None: if expression is None:

View File

@ -2466,7 +2466,7 @@ class Enumeration:
dataToStdout("No output\n") dataToStdout("No output\n")
def sqlFile(self): def sqlFile(self):
conf.unescape = False kb.unescape = False
infoMsg = "executing SQL statements from given file(s)" infoMsg = "executing SQL statements from given file(s)"
logger.info(infoMsg) logger.info(infoMsg)
@ -2484,4 +2484,4 @@ class Enumeration:
conf.dumper.query(query, self.sqlQuery(query)) conf.dumper.query(query, self.sqlQuery(query))
conf.unescape = True kb.unescape = True