From d3bf71083aee417202ad7b6da2f37917b54aa7bd Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Tue, 3 Mar 2020 19:08:45 +0100 Subject: [PATCH 1/2] Fix Futures py2 --- lib/concurrent_py2/futures/__init__.py | 6 +++--- lib/concurrent_py2/futures/process.py | 2 +- lib/concurrent_py2/futures/thread.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/concurrent_py2/futures/__init__.py b/lib/concurrent_py2/futures/__init__.py index 428b14bd..5200ce97 100644 --- a/lib/concurrent_py2/futures/__init__.py +++ b/lib/concurrent_py2/futures/__init__.py @@ -5,7 +5,7 @@ __author__ = 'Brian Quinlan (brian@sweetapp.com)' -from concurrent.futures._base import (FIRST_COMPLETED, +from concurrent_py2.futures._base import (FIRST_COMPLETED, FIRST_EXCEPTION, ALL_COMPLETED, CancelledError, @@ -14,10 +14,10 @@ from concurrent.futures._base import (FIRST_COMPLETED, Executor, wait, as_completed) -from concurrent.futures.thread import ThreadPoolExecutor +from concurrent_py2.futures.thread import ThreadPoolExecutor try: - from concurrent.futures.process import ProcessPoolExecutor + from concurrent_py2.futures.process import ProcessPoolExecutor except ImportError: # some platforms don't have multiprocessing pass diff --git a/lib/concurrent_py2/futures/process.py b/lib/concurrent_py2/futures/process.py index fa5b96fd..7ac14c22 100644 --- a/lib/concurrent_py2/futures/process.py +++ b/lib/concurrent_py2/futures/process.py @@ -44,7 +44,7 @@ Process #1..n: """ import atexit -from concurrent.futures import _base +from concurrent_py2.futures import _base import Queue as queue import multiprocessing import threading diff --git a/lib/concurrent_py2/futures/thread.py b/lib/concurrent_py2/futures/thread.py index b5f832ff..5b3c4946 100644 --- a/lib/concurrent_py2/futures/thread.py +++ b/lib/concurrent_py2/futures/thread.py @@ -4,7 +4,7 @@ """Implements ThreadPoolExecutor.""" import atexit -from concurrent.futures import _base +from concurrent_py2.futures import _base import itertools import Queue as queue import threading From e6a4743743ecebc45307142519f936900d36da92 Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Tue, 3 Mar 2020 20:11:56 +0100 Subject: [PATCH 2/2] Fix Ultima Ricerca --- platformcode/launcher.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/platformcode/launcher.py b/platformcode/launcher.py index 71a3df92..1d3e2427 100644 --- a/platformcode/launcher.py +++ b/platformcode/launcher.py @@ -289,7 +289,11 @@ def run(item=None): # except: # pass - last_search = channeltools.get_channel_setting('Last_searched', 'search', '') + # last_search = channeltools.get_channel_setting('Last_searched', 'search', '') + if channeltools.get_channel_setting('last_search', 'search'): + last_search = channeltools.get_channel_setting('Last_searched', 'search', '') + else: + last_search = '' tecleado = platformtools.dialog_input(last_search)