Initial support for pypy + evennia

game/evennia.py

@@ -283,7 +283,7 @@ def run_menu():
     This launches an interactive menu.
     """
 
-    cmdstr = ["python", "runner.py"]
+    cmdstr = [sys.executable, "runner.py"]
 
     while True:
         # menu loop
@@ -350,7 +350,7 @@ def handle_args(options, mode, service):
     """
 
     inter = options.interactive
-    cmdstr = ["python", "runner.py"]
+    cmdstr = [sys.executable, "runner.py"]
     errmsg = "The %s does not seem to be running."
 
     if mode == 'start':

game/runner.py

@@ -16,10 +16,16 @@ matter the value of this file.
 """
 import os
 import sys
+import time
 from optparse import OptionParser
 from subprocess import Popen
 import Queue, thread
 
+try:
+    import __pypy__ as is_pypy
+except ImportError:
+    is_pypy = False
+
 #
 # System Configuration
 #
@@ -163,6 +169,10 @@ def start_services(server_argv, portal_argv):
         return
 
     if portal_argv:
+        if is_pypy:
+            # This is a hack; without it, the *server* stalls out and never finishes loading under PyPy.
+            time.sleep(1)
+
         try:
             if get_restart_mode(PORTAL_RESTART) == "True":
                 # start portal as interactive, reloadable thread