Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1771 from vincent-lg/fix-accents2

Browse source 
Fix accents in Evennia py3, bring compatibility with Evennia 0.8 data
This commit is contained in:
Griatch 2019-01-19 18:04:10 +01:00 • committed by GitHub
commit abfa47315e
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/utils/dbserialize.py
View file

@ -30,7 +30,7 @@ except ImportError:
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.utils.safestring import SafeString, SafeBytes from django.utils.safestring import SafeString, SafeBytes
from evennia.utils.utils import to_str, uses_database, is_iter from evennia.utils.utils import uses_database, is_iter
from evennia.utils import logger from evennia.utils import logger
__all__ = ("to_pickle", "from_pickle", "do_pickle", "do_unpickle", __all__ = ("to_pickle", "from_pickle", "do_pickle", "do_unpickle",
@ -674,7 +674,7 @@ def from_pickle(data, db_obj=None):
def do_pickle(data): def do_pickle(data):
"""Perform pickle to string""" """Perform pickle to string"""
return to_str(dumps(data, protocol=PICKLE_PROTOCOL)) return dumps(data, protocol=PICKLE_PROTOCOL)
def do_unpickle(data): def do_unpickle(data):