From 105ac8ea777e817bb7e050158df2c5acfa057954 Mon Sep 17 00:00:00 2001 From: Bernardo Damele Date: Wed, 11 Jul 2012 17:06:56 +0100 Subject: [PATCH] deleted unnecessary hg file --- extra/colorama/.hgignore | 2 -- lib/core/option.py | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 extra/colorama/.hgignore diff --git a/extra/colorama/.hgignore b/extra/colorama/.hgignore deleted file mode 100644 index 9643e2cb6..000000000 --- a/extra/colorama/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -glob:virtualenv -glob:MANIFEST diff --git a/lib/core/option.py b/lib/core/option.py index 3ed2308d4..033b8a94b 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -20,6 +20,7 @@ import urlparse import lib.core.common import lib.core.threads +from extra.colorama.initialise import init as coloramainit from extra.keepalive import keepalive from extra.oset.pyoset import oset from extra.socks import socks @@ -1950,6 +1951,7 @@ def init(inputOptions=AttribDict(), overrideOptions=False): based upon command line and configuration file options. """ + coloramainit() __setConfAttributes() __setKnowledgeBaseAttributes() __mergeOptions(inputOptions, overrideOptions)