Server/py: Replace tokenizer() with shlex.split() (erlehmann advice).

[plomrogue] / plomrogue-server.py

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 6760c0287752fffef9f27e53d291a91c04e04a92..9bdab821360dd4262d1de20a9f817e197eb6c8dd 100755 (executable)
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -1,15 +1,10 @@
 import argparse
 import errno
 import os
+import shlex
 import time
 
 
-class HandledException(Exception):
-    """Feature-less Exception child. Use for expected operational errors."""
-
-    pass
-
-
 def setup_server_io(io_db):
     """Fill IO files DB with proper file( path)s. Write process IO test string.
 
@@ -52,50 +47,13 @@ def detect_atomic_leftover(path):
           "aborted previous attempt to write '" + path + "'. Aborting until " \
           "the matter is resolved by removing it from its current path."
     if os.access(path_tmp, os.F_OK):
-        raise HandledException(msg)
+        raise SystemExit(msg)
 
 
 def obey(msg):
     """"""
     print("Input: " + msg)
-
-
-def tokenize(string):
-    """Divide string by ' ', \t & " quotes (that also group). Escape with \."""
-    charlist_A = list(string)
-    i = 0
-    for c in charlist_A:
-        if "\\" == c and i < len(charlist_A) - 1:
-            charlist_A[i] = "remove"
-            charlist_A[i + 1] = charlist_A[i + 1] + "_escaped"
-        i = i + 1
-    charlist_B = []
-    for c in charlist_A:
-        if "remove" != c:
-            charlist_B.append(c)
-    in_quotes = 0
-    i = 0
-    for c in charlist_B:
-        if "\"" == c:
-            in_quotes = 0 if in_quotes else 1
-            if i < len(charlist_B) - 1:
-                charlist_B[i] = "separator"
-        elif (not in_quotes) and (" " == c or "\t" == c):
-            charlist_B[i] = "separator"
-        i = i + 1
-    list_of_charlists = [[]]
-    i = 0
-    for c in charlist_B:
-        if "separator" == c:
-            if [] != list_of_charlists[-1]:
-                list_of_charlists.append([])
-                i = i + 1
-        else:
-            list_of_charlists[i].append(c[0])
-    tokens = []
-    for charlist in list_of_charlists:
-        tokens.append("".join(charlist))
-    return tokens
+    print(shlex.split(msg))
 
 
 io_db = {}
@@ -114,18 +72,16 @@ try:
         if opts.replay < 1:
             opts.replay = 1
         print("Replay mode. Auto-replaying up to turn " + str(opts.replay) +
-              " (if so late  a turn is to be found).")
-        if not os.access(path_savefile, os.F_OK):
-            raise HandledException("No record file found to replay.")
+              " (if so late a turn is to be found).")
+        if not os.access(path_recordfile, os.F_OK):
+            raise SystemExit("No record file found to replay.")
     elif os.access(path_savefile, os.F_OK):
         print(open(path_savefile, "r").read())
     else:
         msg = "MAKE_WORLD " + str(int(time.time()))
         obey(msg)
-except SystemExit:
-    pass
-except HandledException as exception:
-    print("ABORTING: " + exception.args[0])
+except SystemExit as exit:
+    print("ABORTING: " + exit.args[0])
 except:
     print("SOMETHING WENT WRONG IN UNEXPECTED WAYS")
     raise