From 045031e8ae62d431bffd9cd9214e80564d9bcb09 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sun, 13 Sep 2015 16:55:32 -0400 Subject: [PATCH] Revert "Fix character rename, delete, and copy." This reverts commit c72f049ccdf101a88db8814a8d73e0f670887a12. Conflicts: service/character.py --- service/character.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/service/character.py b/service/character.py index ebe65c899..06e2c43c9 100644 --- a/service/character.py +++ b/service/character.py @@ -233,20 +233,17 @@ class Character(object): def rename(self, charID, newName): char = eos.db.getCharacter(charID) char.name = newName - self.saveCharacter(charID) + eos.db.commit() def copy(self, charID): char = eos.db.getCharacter(charID) newChar = copy.deepcopy(char) - eos.db.character_session.add(newChar) - eos.db.character_session.flush([newChar]) + eos.db.save(newChar) return newChar.ID def delete(self, charID): - # It is easier to remove the character from the main session, so banish - # it from the character session and include it over there. char = eos.db.getCharacter(charID) - eos.db.character_session.expunge(char) + eos.db.commit() eos.db.remove(char) def getApiDetails(self, charID):