From b13892f0f3246888ab3c83db041e591991dc58c0 Mon Sep 17 00:00:00 2001 From: Jason Posthuma Date: Wed, 2 Sep 2020 22:26:45 -0600 Subject: [PATCH] windows fixes, added todos --- intterra-airborne-dsa.bat | 3 ++- main.py | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/intterra-airborne-dsa.bat b/intterra-airborne-dsa.bat index 7a84f97..134732e 100644 --- a/intterra-airborne-dsa.bat +++ b/intterra-airborne-dsa.bat @@ -1 +1,2 @@ -python main.py \ No newline at end of file +python main.py +pause \ No newline at end of file diff --git a/main.py b/main.py index 09f6361..02c89d6 100644 --- a/main.py +++ b/main.py @@ -13,11 +13,11 @@ import re import settings from signal import signal, SIGINT -s3 = boto3.client('s3') +s3 = boto3.client('s3') # TODO: pass keys from json config (optionally) def run(): # init - bucket = settings.BUCKET + bucket = settings.BUCKET # TODO: Convert to persistant .json config now = datetime.utcnow() dir_path = os.path.dirname(os.path.realpath(__file__)) welcome() @@ -30,7 +30,7 @@ def run(): else: answer = '' while answer != 'yes' and answer != 'no': - print(f'Use current mission (yes/no): "{mission_name}" from {mission_timestamp.ctime()}?', end=' ') + print(f'Use current mission (yes/no): "{mission_name}" from {mission_timestamp.ctime()}?') answer = sys.stdin.readline().rstrip('\n').rstrip('\n') if answer == 'no': mission_name = get_mission_from_input() @@ -49,7 +49,7 @@ def run(): def get_mission_from_input(): name = '' while not re.match(r'^[0-9a-z]+$', name, re.IGNORECASE): - print('Please enter mission name (alphanumeric): ', end='') + print('Please enter mission name (alphanumeric): ') name = sys.stdin.readline().rstrip('\n').rstrip('\n') return name