fixed log message dialog for messages containing "<>" characters

fixed potentially NotImplemented Queue function for MacOS


git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@986 bbaffbd6-741e-11dd-a85d-61de82d9cad9

src/pycam/Utils/log.py

@@ -116,6 +116,10 @@ class GTKHandler(logging.Handler):
             except (UnicodeDecodeError, LookupError):
                 # remove all critical characters
                 message = re.sub("[^\w\s]", "", raw_message)
+        # Replace all "<>" characters (invalid for markup styles) with html
+        # entities.
+        message = re.sub("<", "&lt;", message)
+        message = re.sub(">", "&gt;", message)
         import gtk
         if record.levelno <= 20:
             message_type = gtk.MESSAGE_INFO

src/pycam/Utils/threading.py

@@ -131,8 +131,12 @@ def get_task_statistics():
     global __manager
     result = {}
     if not __manager is None:
+        try:
             result["tasks"] = __manager.tasks().qsize()
             result["results"] = __manager.results().qsize()
+        except NotImplementedError:
+            # this can happen on MacOS (see multiprocessing doc)
+            pass
         result["pending"] = __manager.pending_tasks().length()
         result["cache"] = __manager.cache().length()
     return result
@@ -595,7 +599,12 @@ def run_in_parallel_remote(func, args_list, unordered=False,
 
 def _cleanup_job(job_id, tasks_queue, pending_tasks, finished_jobs):
     # flush the task queue
+    try:
         queue_len = tasks_queue.qsize()
+    except NotImplementedError:
+        # this can happen on MacOS (according to the multiprocessing doc)
+        # -> no cleanup of old processes
+        queue_len = 0
     # remove all remaining tasks with the current job id
     removed_job_counter = 0
     for index in range(queue_len):