Terminal Capsule Pull Out and clean up

juice-ryang · Mar 14, 2016 · ec498a3 · ec498a3
1 parent 0673b6c
commit ec498a3
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 27 deletions.
diff --git a/OnlineJudgeServer/.terminal_capsule.py.swp b/OnlineJudgeServer/.terminal_capsule.py.swp
diff --git a/OnlineJudgeServer/terminal_capsule.py b/OnlineJudgeServer/terminal_capsule.py
@@ -312,30 +312,3 @@ def _GOT_STDOUT():
                                 break
             except Capsule.DEAD as dying_message:
                 _FAIL()
-
-
-if __name__ == "__main__":
-    from click import (
-        argument,
-        command,
-        option,
-        Choice,
-        File,
-        Path,
-    )
-
-    @command()
-    @argument('program', type=Path())
-    @option('-m', '--mode',
-            'mode', type=Choice(_Registered.keys()), default='capture')
-    @option('-j', '--json', type=Path(), default=None,
-            help='Generate .json (or playback/validate)')
-    @option('-o', '--out', type=File('wb'), default=None,
-            help='Generate .out  (or logging)')
-    @option('-t', '--timeout', type=int, default=None,
-            help='Set timeout (default: .05s, validate: 2.5s)')
-    def __main__(program, mode, json, out, timeout):
-        """Entrypoint for Terminal Capsule."""
-        _Registered[mode](program, json, out, timeout=timeout)
-
-    __main__()
diff --git a/terminal_capsule.py b/terminal_capsule.py
@@ -0,0 +1,28 @@
+from OnlineJudgeServer.terminal_capsule import _Registered
+
+
+if __name__ == "__main__":
+    from click import (
+        argument,
+        command,
+        option,
+        Choice,
+        File,
+        Path,
+    )
+
+    @command()
+    @argument('program', type=Path())
+    @option('-m', '--mode',
+            'mode', type=Choice(_Registered.keys()), default='capture')
+    @option('-j', '--json', type=Path(), default=None,
+            help='Generate .json (or playback/validate)')
+    @option('-o', '--out', type=File('wb'), default=None,
+            help='Generate .out  (or logging)')
+    @option('-t', '--timeout', type=int, default=None,
+            help='Set timeout (default: .05s, validate: 2.5s)')
+    def __main__(program, mode, json, out, timeout):
+        """Entrypoint for Terminal Capsule."""
+        _Registered[mode](program, json, out, timeout=timeout)
+
+    __main__()