Minor bugfixes

PythonCoderAS · PythonCoderAS · commit cee07be4524a · 2020-03-14T21:27:35.000-04:00
diff --git a/handlers/python.py b/handlers/python.py
@@ -11,9 +11,9 @@ def run(self, code_file):
         try:
             check_call(["bash", "-c", 'which -s python3'])
         except Exception:
-            py_str = "python3"
-        else:
             py_str = "python"
+        else:
+            py_str = "python3"
         exit(run([py_str, code_file]).returncode)
 
     def build(self, code, directory=None):
@@ -29,7 +29,7 @@ def run(self, code_file):
         try:
             check_call(["bash", "-c", 'which -s python2'])
         except Exception:
-            py_str = "python2"
-        else:
             py_str = "python"
+        else:
+            py_str = "python2"
         exit(run([py_str, code_file]).returncode)
diff --git a/main.py b/main.py
@@ -25,15 +25,13 @@ def main(args=None):
     )
     parser.add_argument(
         "--keep",
-        nargs=1,
         type=pathlib.Path,
         metavar="DIRECTORY",
         default=None,
         help="Store the script in the given directory",
     )
     parser.add_argument(
         "--filename",
-        nargs=1,
         help="Give the stored file the speified name (does not do anything without --keep)",
         default="script",
     )
@@ -58,14 +56,13 @@ def main(args=None):
     for key, value in parsed_dict.items():
         if value:
             parser = handlers["--" + key]
-            break
-    code = sys.stdin.read()
-    if ns.keep:
-        dir = ns.keep
-        os.makedirs(dir, exist_ok=True)
-        parser().build(code, str(dir.joinpath(ns.filename)))
-    else:
-        parser().build(code)
+            code = sys.stdin.read()
+            if ns.keep:
+                dir = ns.keep
+                os.makedirs(dir, exist_ok=True)
+                parser().build(code, str(dir.joinpath(ns.filename)) + "." + key)
+            else:
+                parser().build(code)
 
 
 if __name__ == "__main__":
