From c9404bfb51c5efd3e6af1fff5738f8afd8d27278 Mon Sep 17 00:00:00 2001 From: Ahmed Charles Date: Fri, 23 Oct 2015 04:20:56 +0000 Subject: [PATCH] Don't use long, since it doesn't exist in python3. --- evennia/objects/manager.py | 3 ++- evennia/utils/dbserialize.py | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/evennia/objects/manager.py b/evennia/objects/manager.py index 4d77b7f237..3bb9093943 100644 --- a/evennia/objects/manager.py +++ b/evennia/objects/manager.py @@ -9,6 +9,7 @@ from django.db.models.fields import exceptions from evennia.typeclasses.managers import TypedObjectManager, TypeclassManager from evennia.typeclasses.managers import returns_typeclass, returns_typeclass_list from evennia.utils.utils import to_unicode, is_iter, make_iter, string_partial_matching +from builtins import int __all__ = ("ObjectManager",) _GA = object.__getattribute__ @@ -149,7 +150,7 @@ class ObjectDBManager(TypedObjectManager): ## This doesn't work if attribute_value is an object. Workaround below - if isinstance(attribute_value, (basestring, int, float, bool, long)): + if isinstance(attribute_value, (basestring, int, float, bool)): return self.filter(cand_restriction & type_restriction & Q(db_attributes__db_key=attribute_name, db_attributes__db_value=attribute_value)) else: # We have to loop for safety since the referenced lookup gives deepcopy error if attribute value is an object. diff --git a/evennia/utils/dbserialize.py b/evennia/utils/dbserialize.py index 4cc78a8fb9..60578106de 100644 --- a/evennia/utils/dbserialize.py +++ b/evennia/utils/dbserialize.py @@ -31,6 +31,7 @@ from django.contrib.contenttypes.models import ContentType from evennia.server.models import ServerConfig from evennia.utils.utils import to_str, uses_database from evennia.utils import logger +from builtins import int __all__ = ("to_pickle", "from_pickle", "do_pickle", "do_unpickle") @@ -121,7 +122,7 @@ class _SaverMutable(object): def process_tree(item, parent): "recursively populate the tree, storing parents" dtype = type(item) - if dtype in (basestring, int, long, float, bool, tuple): + if dtype in (basestring, int, float, bool, tuple): return item elif dtype == list: dat = _SaverList(parent=parent) @@ -280,7 +281,7 @@ def to_pickle(data): def process_item(item): "Recursive processor and identification of data" dtype = type(item) - if dtype in (basestring, int, long, float, bool): + if dtype in (basestring, int, float, bool): return item elif dtype == tuple: return tuple(process_item(val) for val in item) @@ -325,7 +326,7 @@ def from_pickle(data, db_obj=None): def process_item(item): "Recursive processor and identification of data" dtype = type(item) - if dtype in (basestring, int, long, float, bool): + if dtype in (basestring, int, float, bool): return item elif _IS_PACKED_DBOBJ(item): # this must be checked before tuple @@ -348,7 +349,7 @@ def from_pickle(data, db_obj=None): def process_tree(item, parent): "Recursive processor, building a parent-tree from iterable data" dtype = type(item) - if dtype in (basestring, int, long, float, bool): + if dtype in (basestring, int, float, bool): return item elif _IS_PACKED_DBOBJ(item): # this must be checked before tuple