X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=plomrogue-server.py;h=0b3ce1f85f72f7800527b5b13a05da7218d3f3d4;hb=833a1fa083b563f0ac774b68780e7419fda65238;hp=286d3eb362b86b36707756479680fc1321396f7f;hpb=56867ba7a05f616174db6496ebc4115592ad6e6c;p=plomrogue

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 286d3eb..0b3ce1f 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -4,12 +4,6 @@ import os
 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,7 +46,7 @@ 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):
@@ -61,7 +55,7 @@ def obey(msg):
 
 
 def tokenize(string):
-    """Divide string by " ", \t and quotes (that also group). Escape with \."""
+    """Divide string by ' ', \t & " quotes (that also group). Escape with \."""
     charlist_A = list(string)
     i = 0
     for c in charlist_A:
@@ -114,18 +108,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