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

src/commands/default/system.py

@@ -17,7 +17,7 @@ from src.server.sessionhandler import SESSIONS
 from src.scripts.models import ScriptDB
 from src.objects.models import ObjectDB
 from src.players.models import PlayerDB
-from src.utils import logger, utils, gametime, create
+from src.utils import logger, utils, gametime, create, is_pypy
 from src.commands.default.muxcommand import MuxCommand
 
 # delayed imports
@@ -692,6 +692,9 @@ class CmdServerLoad(MuxCommand):
             for row in ftable:
                 string += "\n " + "{w%s{n" % row[0] + "".join(row[1:])
 
+            if not is_pypy:
+                # Cache size measurements are not available on PyPy because it lacks sys.getsizeof
+                
                 # object cache size
                 cachedict = _idmapper.cache_size()
                 totcache = cachedict["_total"]
@@ -711,5 +714,6 @@ class CmdServerLoad(MuxCommand):
                 string += "\n{w On-entity Attribute cache usage:{n %5.2f MB (%i attrs)" % (attr_cache_info[1], attr_cache_info[0])
                 string += "\n{w On-entity Field cache usage:{n %5.2f MB (%i fields)" % (field_cache_info[1], field_cache_info[0])
                 string += "\n{w On-entity Property cache usage:{n %5.2f MB (%i props)" % (prop_cache_info[1], prop_cache_info[0])
+
         caller.msg(string)
 

src/scripts/scripts.py

@@ -16,10 +16,12 @@ from src.server.sessionhandler import SESSIONS
 from src.typeclasses.typeclass import TypeClass
 from src.scripts.models import ScriptDB
 from src.comms import channelhandler
-from src.utils import logger
+from src.utils import logger, is_pypy
 from django.utils.translation import ugettext as _
 
-__all__ = ("Script", "DoNothing", "CheckSessions", "ValidateScripts", "ValidateChannelHandler", "ClearAttributeCache")
+__all__ = ["Script", "DoNothing", "CheckSessions", "ValidateScripts", "ValidateChannelHandler"]
+if not is_pypy:
+    __all__.append("ClearAttributeCache")
 
 _ATTRIBUTE_CACHE_MAXSIZE = settings.ATTRIBUTE_CACHE_MAXSIZE # attr-cache size in MB.
 
@@ -446,7 +448,9 @@ class ValidateChannelHandler(Script):
         #print "ValidateChannelHandler run."
         channelhandler.CHANNELHANDLER.update()
 
-class ClearAttributeCache(Script):
+# PyPy does not support sys.getsizeof, so the attribute cache dump script is skipped here.
+if not is_pypy:
+    class ClearAttributeCache(Script):
         "Clear the attribute cache."
         def at_script_creation(self):
             "Setup the script"

src/utils/__init__.py

@@ -0,0 +1,4 @@
+try:
+    import __pypy__ as is_pypy
+except ImportError:
+    is_pypy = False