From c5510acb735fe9150caf4320e116aeba3a007442 Mon Sep 17 00:00:00 2001 From: Terrtia Date: Mon, 11 Nov 2019 10:29:36 +0100 Subject: [PATCH] fix: [Cryptocurrency] fix import conflict --- bin/Cryptocurrencies.py | 2 +- bin/lib/Domain.py | 4 +++- var/www/blueprints/crawler_splash.py | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/Cryptocurrencies.py b/bin/Cryptocurrencies.py index 2bb6ba2a..260ff721 100755 --- a/bin/Cryptocurrencies.py +++ b/bin/Cryptocurrencies.py @@ -26,8 +26,8 @@ import redis import signal sys.path.append(os.path.join(os.environ['AIL_BIN'], 'packages')) -import Cryptocurrency import Item +import Cryptocurrency class TimeoutException(Exception): diff --git a/bin/lib/Domain.py b/bin/lib/Domain.py index 9220a9e2..a1e814c7 100755 --- a/bin/lib/Domain.py +++ b/bin/lib/Domain.py @@ -15,12 +15,14 @@ import random sys.path.append(os.path.join(os.environ['AIL_BIN'], 'packages/')) import Correlation -from Cryptocurrency import cryptocurrency +import Cryptocurrency from Pgp import pgp import Decoded import Item import Tag +cryptocurrency = Cryptocurrency.cryptocurrency + sys.path.append(os.path.join(os.environ['AIL_BIN'], 'lib/')) import ConfigLoader diff --git a/var/www/blueprints/crawler_splash.py b/var/www/blueprints/crawler_splash.py index e1639c30..2f142a9c 100644 --- a/var/www/blueprints/crawler_splash.py +++ b/var/www/blueprints/crawler_splash.py @@ -69,7 +69,5 @@ def showDomain(): dict_domain['crawler_history'] = domain.get_domain_items_crawled(items_link=True, epoch=epoch, item_screenshot=True, item_tag=True) # # TODO: handle multiple port dict_domain['crawler_history']['random_item'] = random.choice(dict_domain['crawler_history']['items']) - print(dict_domain) - return render_template("showDomain.html", dict_domain=dict_domain, bootstrap_label=bootstrap_label, modal_add_tags=get_modal_add_tags(dict_domain['domain'], tag_type="domain"))