Merge remote-tracking branch 'origin/master' into no-bindings

Author: robkooper

pyclowder/connectors.py

@@ -883,7 +883,7 @@ def start_thread(self, json_body):
 
     def is_finished(self):
         with self.lock:
-            return self.thread and not self.thread.isAlive() and self.finished and len(self.messages) == 0
+            return self.thread and not self.thread.is_alive() and self.finished and len(self.messages) == 0
 
     def process_messages(self, channel, rabbitmq_queue):
         while self.messages:

pyclowder/extractors.py

@@ -143,7 +143,7 @@ def start(self):
                     for key, value in self.extractor_info['process'].items():
                         for mt in value:
                             # Replace trailing '*' with '#'
-                            mt = re.sub('(\*$)', '#', mt)
+                            mt = re.sub(r'(\*$)', '#', mt)
                             if mt.find('*') > -1:
                                 logger.error("Invalid '*' found in rabbitmq_key: %s" % mt)
                             else: