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

Removed some spurious imports (the six tools) which doesn't seem to work for everyone.

Browse source
This commit is contained in:
Griatch 2013-04-14 21:50:11 +02:00
parent 27668a565d
commit d0edb84909
1 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/utils/picklefield.py
View file

@ -32,12 +32,9 @@ Modified for Evennia by Griatch.
from copy import deepcopy from copy import deepcopy
from base64 import b64encode, b64decode from base64 import b64encode, b64decode
from zlib import compress, decompress from zlib import compress, decompress
import six
import django import django
from django.db import models from django.db import models
from src.utils.dbserialize import to_pickle
# django 1.5 introduces force_text instead of force_unicode # django 1.5 introduces force_text instead of force_unicode
try: try:
from django.utils.encoding import force_text from django.utils.encoding import force_text
@ -49,15 +46,8 @@ try:
from cPickle import loads, dumps # cpython 2.x from cPickle import loads, dumps # cpython 2.x
except ImportError: except ImportError:
from pickle import loads, dumps # cpython 3.x, other interpreters from pickle import loads, dumps # cpython 3.x, other interpreters
try:
from django.utils import simplejson as json
except ImportError:
import json
DEFAULT_PROTOCOL = 2 DEFAULT_PROTOCOL = 2
#from picklefield import DEFAULT_PROTOCOL
#from picklefield.compat import force_text, loads, dumps
class PickledObject(str): class PickledObject(str):
""" """