Changed all src/ and ev references to evennia

evennia/scripts/__init__.py

@@ -1,15 +0,0 @@
-"""
-Makes it easier to import by grouping all relevant things already at this
-level.
-
-You can henceforth import most things directly from src.scripts
-Also, the initiated object manager is available as src.scripts.manager.
-
-"""
-
-# Note - we MUST NOT import src.scripts.scripts here, or
-# proxy models will fall under Django migrations.
-#from src.scripts.scripts import *
-#from src.scripts.models import ScriptDB
-
-#manager = ScriptDB.objects

evennia/scripts/admin.py

@@ -2,9 +2,9 @@
 # This sets up how models are displayed
 # in the web admin interface.
 #
-from src.typeclasses.admin import AttributeInline, TagInline
+from evennia.typeclasses.admin import AttributeInline, TagInline
 
-from src.scripts.models import ScriptDB
+from evennia.scripts.models import ScriptDB
 from django.contrib import admin
 
 

evennia/scripts/manager.py

@@ -3,9 +3,9 @@ The custom manager for Scripts.
 """
 
 from django.db.models import Q
-from src.typeclasses.managers import TypedObjectManager, TypeclassManager
-from src.typeclasses.managers import returns_typeclass_list
-from src.utils.utils import make_iter
+from evennia.typeclasses.managers import TypedObjectManager, TypeclassManager
+from evennia.typeclasses.managers import returns_typeclass_list
+from evennia.utils.utils import make_iter
 __all__ = ("ScriptManager",)
 _GA = object.__getattribute__
 
@@ -225,7 +225,7 @@ class ScriptDBManager(TypedObjectManager):
         new_obj = new_obj if new_obj is not None else original_script.obj
         new_locks = new_locks if new_locks is not None else original_script.db_lock_storage
 
-        from src.utils import create
+        from evennia.utils import create
         new_script = create.create_script(typeclass, key=new_key, obj=new_obj,
                                           locks=new_locks, autostart=True)
         return new_script

evennia/scripts/models.py

@@ -27,9 +27,9 @@ Common examples of uses of Scripts:
 from django.conf import settings
 from django.db import models
 from django.core.exceptions import ObjectDoesNotExist
-from src.typeclasses.models import TypedObject
-from src.scripts.manager import ScriptDBManager
-from src.utils.utils import dbref, to_str
+from evennia.typeclasses.models import TypedObject
+from evennia.scripts.manager import ScriptDBManager
+from evennia.utils.utils import dbref, to_str
 
 __all__ = ("ScriptDB",)
 _GA = object.__getattribute__
@@ -132,7 +132,7 @@ class ScriptDB(TypedObject):
         except AttributeError:
             pass
         if isinstance(value, (basestring, int)):
-            from src.objects.models import ObjectDB
+            from evennia.objects.models import ObjectDB
             value = to_str(value, force_string=True)
             if (value.isdigit() or value.startswith("#")):
                 dbid = dbref(value, reqhash=False)

evennia/scripts/scripthandler.py

@@ -5,9 +5,9 @@ An scripthandler is automatically added to all game objects. You
 access it through the property 'scripts' on the game object.
 """
 
-from src.scripts.models import ScriptDB
-from src.utils import create
-from src.utils import logger
+from evennia.scripts.models import ScriptDB
+from evennia.utils import create
+from evennia.utils import logger
 
 from django.utils.translation import ugettext as _
 

evennia/scripts/scripts.py

@@ -8,12 +8,12 @@ It also defines a few common scripts.
 from twisted.internet.defer import Deferred, maybeDeferred
 from twisted.internet.task import LoopingCall
 from django.conf import settings
-from src.typeclasses.models import TypeclassBase
 from django.utils.translation import ugettext as _
-from src.scripts.models import ScriptDB
-from src.scripts.manager import ScriptManager
-from src.comms import channelhandler
-from src.utils import logger
+from evennia.typeclasses.models import TypeclassBase
+from evennia.scripts.models import ScriptDB
+from evennia.scripts.manager import ScriptManager
+from evennia.comms import channelhandler
+from evennia.utils import logger
 
 __all__ = ["Script", "DoNothing", "CheckSessions",
            "ValidateScripts", "ValidateChannelHandler"]
@@ -555,7 +555,7 @@ class CheckSessions(Script):
         "called every 60 seconds"
         global _SESSIONS
         if not _SESSIONS:
-            from src.server.sessionhandler import SESSIONS as _SESSIONS
+            from evennia.server.sessionhandler import SESSIONS as _SESSIONS
         #print "session check!"
         #print "ValidateSessions run"
         _SESSIONS.validate_sessions()
@@ -576,7 +576,7 @@ class ValidateIdmapperCache(Script):
         "Called every ~5 mins"
         global _FLUSH_CACHE
         if not _FLUSH_CACHE:
-            from src.utils.idmapper.base import conditional_flush as _FLUSH_CACHE
+            from evennia.utils.idmapper.base import conditional_flush as _FLUSH_CACHE
         _FLUSH_CACHE(_IDMAPPER_CACHE_MAX_MEMORY)
 
 class ValidateScripts(Script):

evennia/scripts/tickerhandler.py

@@ -11,7 +11,7 @@ server reloads and be started automaticall on boot.
 
 Example:
 
-    from src.scripts.tickerhandler import TICKER_HANDLER
+    from evennia.scripts.tickerhandler import TICKER_HANDLER
 
     # tick myobj every 15 seconds
     TICKER_HANDLER.add(myobj, 15)
@@ -49,10 +49,10 @@ call the handler's save() and restore() methods when the server reboots.
 
 """
 from twisted.internet.defer import inlineCallbacks
-from src.scripts.scripts import ExtendedLoopingCall
-from src.server.models import ServerConfig
-from src.utils.logger import log_trace
-from src.utils.dbserialize import dbserialize, dbunserialize, pack_dbobj, unpack_dbobj
+from evennia.scripts.scripts import ExtendedLoopingCall
+from evennia.server.models import ServerConfig
+from evennia.utils.logger import log_trace
+from evennia.utils.dbserialize import dbserialize, dbunserialize, pack_dbobj, unpack_dbobj
 
 _GA = object.__getattribute__
 _SA = object.__setattr__