Merge branch 'python-rename-await' into develop

Author: spiderpug

Cloud/S3Sync.py

@@ -38,14 +38,14 @@ def __init__(self, bucket, mapping: {}):
         self.uploaded_requests = {}
 
     def sync(self, resolve_conflict_using_local=True, delete=False):
-        self.await()
+        self.finish()
 
         self.thread = BotThread(self.__sync_thread, resolve_conflict_using_local, delete)
         self.thread.name = 'S3 Sync'
 
         self.thread.start()
 
-    def await(self):
+    def finish(self):
         if self.thread and self.thread.is_alive():
             self.thread.join()
 

ConsoleLauncher.py

@@ -107,7 +107,7 @@ def get_exchange_creds(self, api_path):
     def sync_down(self):
         if self.enable_cloud:
             self.s3pers.sync(False, True)
-            self.s3pers.await()
+            self.s3pers.finish()
 
     def init_file_watch_list(self):
         target_path_list = [f for f in listdir(self.trades_path) if