From c4f63a92b27d9b165423dfe207e5783e25737276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Oudin?= Date: Mon, 26 Feb 2018 14:01:29 +0100 Subject: [PATCH] Error in the merge, mea culpa --- histories/models.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/histories/models.py b/histories/models.py index 47abe56..401b67d 100644 --- a/histories/models.py +++ b/histories/models.py @@ -6,7 +6,6 @@ interests, keywords... from collections import namedtuple import random from math import floor -from queue import Queue from xml.etree import ElementTree as ET from datetime import datetime from django.db import models @@ -168,11 +167,11 @@ def generate_partial_history(user, t_start): basis = generate_first_url(user) result.append(PartialHistoryEntry(basis, timestamp)) t_start += 5 * random.weibullvariate(1, 1.5) - queue = Queue() - crawler = crawl.CrawlingThread(basis, queue) + output_tree = [] + crawler = crawl.CrawlingThread(basis, output_tree) crawler.start() crawler.join() - urls = queue.get() + urls = crawler.output_tree for url in urls: t_start += 5 * random.weibullvariate(1, 1.5) result.append(PartialHistoryEntry(url, timestamp))