Merge.

src/commands/default/building.py

@@ -666,7 +666,6 @@ class CmdDig(ObjManipCommand):
                 if not typeclass:
                     typeclass = settings.BASE_EXIT_TYPECLASS
 
-                print typeclass, to_exit["name"], location, to_exit["aliases"],lockstring, new_room, caller
                 new_to_exit = create.create_object(typeclass, to_exit["name"], location,
                                                    aliases=to_exit["aliases"],
                                                    locks=lockstring, destination=new_room, report_to=caller)

src/players/admin.py

@@ -133,15 +133,22 @@ class UserAdmin(BaseUserAdmin):
     def save_formset(self, request, form, formset, change):
         "Run all hooks on the player object"
         super(UserAdmin, self).save_formset(request, form, formset, change)
-        playerdb = form.instance.get_profile()
+        userobj = form.instance
+        playerobj = userobj.get_profile()
         if not change:
-            create.create_player("", "", "", 
+            #uname, passwd, email = str(request.POST.get(u"username")), \
-                                 typeclass=playerdb.db_typeclass_path,
+            #        str(request.POST.get(u"password1")), str(request.POST.get(u"email"))
-                                 create_character=False,
+            typeclass = str(request.POST.get(u"playerdb_set-0-db_typeclass_path"))
-                                 player_dbobj=playerdb)
+
-        if playerdb.db_obj:
+            create.create_player("","","",
-            playerdb.db_obj.db_player = playerdb
+                                 user=userobj,
-            playerdb.db_obj.save()
+                                 typeclass=typeclass,
+                                 player_dbobj=playerobj,
+                                 create_character=False)
+
+#        if playerdb.db_obj:
+#            playerdb.db_obj.db_player = playerdb
+#            playerdb.db_obj.save()
 
         #assert False, (form.instance, form.instance.get_profile())
 

src/players/models.py

@@ -47,7 +47,6 @@ from django.utils.encoding import smart_str
 
 from src.server.caches import get_field_cache, set_field_cache, del_field_cache
 from src.server.caches import get_prop_cache, set_prop_cache, del_prop_cache
-from src.server.sessionhandler import SESSIONS
 from src.players import manager
 from src.typeclasses.models import Attribute, TypedObject, TypeNick, TypeNickHandler
 from src.typeclasses.typeclass import TypeClass
@@ -58,6 +57,7 @@ from src.utils.utils import inherits_from
 
 __all__  = ("PlayerAttribute", "PlayerNick", "PlayerDB")
 
+_SESSIONS = None
 _AT_SEARCH_RESULT = utils.variable_from_module(*settings.SEARCH_AT_RESULT.rsplit('.', 1))
 
 _GA = object.__getattribute__
@@ -340,7 +340,10 @@ class PlayerDB(TypedObject):
     #@property
     def sessions_get(self):
         "Getter. Retrieve sessions related to this player/user"
-        return SESSIONS.sessions_from_player(self)
+        global _SESSIONS
+        if not _SESSIONS:
+            from src.server.sessionhandler import SESSIONS as _SESSIONS
+        return _SESSIONS.sessions_from_player(self)
     #@sessions.setter
     def sessions_set(self, value):
         "Setter. Protects the sessions property from adding things"

src/scripts/scripts.py

@@ -12,7 +12,6 @@ from twisted.internet.defer import maybeDeferred
 from twisted.internet.task import LoopingCall
 from django.conf import settings
 from src.server import caches
-from src.server.sessionhandler import SESSIONS
 from src.typeclasses.typeclass import TypeClass
 from src.scripts.models import ScriptDB
 from src.comms import channelhandler
@@ -23,6 +22,7 @@ __all__ = ["Script", "DoNothing", "CheckSessions", "ValidateScripts", "ValidateC
 if not is_pypy:
     __all__.append("ClearAttributeCache")
 
+_SESSIONS = None
 _ATTRIBUTE_CACHE_MAXSIZE = settings.ATTRIBUTE_CACHE_MAXSIZE # attr-cache size in MB.
 
 #
@@ -416,9 +416,12 @@ class CheckSessions(Script):
 
     def at_repeat(self):
         "called every 60 seconds"
+        global _SESSIONS
+        if not _SESSIONS:
+            from src.server.sessionhandler import SESSIONS as _SESSIONS
         #print "session check!"
         #print "ValidateSessions run"
-        SESSIONS.validate_sessions()
+        _SESSIONS.validate_sessions()
 
 class ValidateScripts(Script):
     "Check script validation regularly"

src/utils/create.py

@@ -469,6 +469,7 @@ def create_player(name, email, password,
             # use the typeclass from this object
             typeclass = new_db_player.typeclass_path
         else:
+            new_user = User.objects.get(username=new_user.username)
             new_db_player = _PlayerDB(db_key=name, user=new_user)
             new_db_player.save()
             # assign the typeclass