py2 raw_input to p3 input

joneser005 · May 22, 2017 · 2848d90 · 2848d90
1 parent 1e76c1e
commit 2848d90
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/runner/management/commands/seed.py b/runner/management/commands/seed.py
@@ -54,11 +54,7 @@ def handle(self, *args, **options):
             finished_ct = Run.objects.filter(race=race).filter(run_completed=True).count()
             if 0 < finished_ct:
                 print('Race {} has {} completed runs'.format(race, finished_ct))
-<<<<<<< HEAD
                 if 'confirm' == input(
-=======
-                if 'confirm' == raw_input(
->>>>>>> origin/master
                         'Type \'confirm\' to destroy the results for this race and re-seed it, or anything else to exit: '):
                     unfinished_ct = Run.objects.filter(race=race).filter(run_completed=False).count()
                     log.info('Deleting all {} Runs for race, {}'.format(unfinished_ct, race))

diff --git a/runner/management/commands/simulate.py b/runner/management/commands/simulate.py
@@ -39,11 +39,7 @@ def handle(self, *args, **options):
 
         print('About to create {} simulated results for {}'.format(runs_to_complete, race))
         print('!!!! DO NOT run this on production data !!!!!')
-<<<<<<< HEAD
         if 'confirm' == input('Type \'confirm\' to proceed or anything else to exit: '):
-=======
-        if 'confirm' == raw_input('Type \'confirm\' to proceed or anything else to exit: '):
->>>>>>> origin/master
             log.warning('Simulating race {} with random data.'.format(race))
             self.completeRuns(race, runs_to_complete)
         else: