From d0edb84909ebf5df0b3f73893b51cf24b5f68266 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 14 Apr 2013 21:50:11 +0200 Subject: [PATCH] Removed some spurious imports (the six tools) which doesn't seem to work for everyone. --- src/utils/picklefield.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/utils/picklefield.py b/src/utils/picklefield.py index d5aef91f39..8caa0afef4 100644 --- a/src/utils/picklefield.py +++ b/src/utils/picklefield.py @@ -32,12 +32,9 @@ Modified for Evennia by Griatch. from copy import deepcopy from base64 import b64encode, b64decode from zlib import compress, decompress -import six import django from django.db import models -from src.utils.dbserialize import to_pickle - # django 1.5 introduces force_text instead of force_unicode try: from django.utils.encoding import force_text @@ -49,15 +46,8 @@ try: from cPickle import loads, dumps # cpython 2.x except ImportError: 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 -#from picklefield import DEFAULT_PROTOCOL -#from picklefield.compat import force_text, loads, dumps - class PickledObject(str): """