Merge remote-tracking branch 'origin/master'

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

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

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

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)