Merge branch 'master' into development

Conflicts:
	gui/builtinContextMenus/amount.py
	gui/builtinStatsViews/priceViewFull.py
	service/fit.py
	service/prefetch.py

service/character.py

@@ -44,6 +44,7 @@ logger = logging.getLogger(__name__)
 class CharacterImportThread(threading.Thread):
     def __init__(self, paths, callback):
         threading.Thread.__init__(self)
+        self.name = "CharacterImport"
         self.paths = paths
         self.callback = callback
 
@@ -100,6 +101,7 @@ class CharacterImportThread(threading.Thread):
 class SkillBackupThread(threading.Thread):
     def __init__(self, path, saveFmt, activeFit, callback):
         threading.Thread.__init__(self)
+        self.name = "SkillBackup"
         self.path = path
         self.saveFmt = saveFmt
         self.activeFit = activeFit

service/market.py

@@ -49,6 +49,10 @@ mktRdy = threading.Event()
 
 
 class ShipBrowserWorkerThread(threading.Thread):
+    def __init__(self):
+        threading.Thread.__init__(self)
+        self.name = "ShipBrowser"
+
     def run(self):
         self.queue = Queue.Queue()
         self.cache = {}
@@ -80,6 +84,10 @@ class ShipBrowserWorkerThread(threading.Thread):
 
 
 class PriceWorkerThread(threading.Thread):
+    def __init__(self):
+        threading.Thread.__init__(self)
+        self.name = "PriceWorker"
+
     def run(self):
         self.queue = Queue.Queue()
         self.wait = {}
@@ -115,6 +123,10 @@ class PriceWorkerThread(threading.Thread):
 
 
 class SearchWorkerThread(threading.Thread):
+    def __init__(self):
+        threading.Thread.__init__(self)
+        self.name = "SearchWorker"
+
     def run(self):
         self.cv = threading.Condition()
         self.searchRequest = None

service/prefetch.py

@@ -31,24 +31,6 @@ import logging
 
 logger = logging.getLogger(__name__)
 
-
-class PrefetchThread(threading.Thread):
-    def run(self):
-        # We're a daemon thread, as such, interpreter might get shut down while we do stuff
-        # Make sure we don't throw tracebacks to console
-        try:
-            es_Character.setSkillList(db.getItemsByCategory(
-                "Skill",
-                eager=("effects", "attributes", "attributes.info.icon", "attributes.info.unit", "icon")
-            ))
-        except:
-            pass
-
-
-prefetch = PrefetchThread()
-prefetch.daemon = True
-prefetch.start()
-
 # The following code does not belong here, however until we rebuild skeletons
 # to include modified pyfa.py, this is the best place to put it. See GH issue
 # #176

service/update.py

@@ -32,6 +32,7 @@ from service.settings import UpdateSettings
 class CheckUpdateThread(threading.Thread):
     def __init__(self, callback):
         threading.Thread.__init__(self)
+        self.name = "CheckUpdate"
         self.callback = callback
         self.settings = UpdateSettings.getInstance()
         self.network = Network.getInstance()