From 11b61fe335fc954b7fceb6a3fe895ca7f1bd33d3 Mon Sep 17 00:00:00 2001
From: Ahmed Charles <acharles@outlook.com>
Date: Fri, 23 Oct 2015 02:26:37 +0000
Subject: [PATCH] Import python3 compatible object.

---
 evennia/__init__.py                           | 1 +
 evennia/commands/cmdsethandler.py             | 1 +
 evennia/comms/channelhandler.py               | 1 +
 evennia/comms/models.py                       | 1 +
 evennia/contrib/barter.py                     | 1 +
 evennia/contrib/menusystem.py                 | 1 +
 evennia/contrib/rpsystem.py                   | 1 +
 evennia/locks/lockhandler.py                  | 1 +
 evennia/objects/models.py                     | 1 +
 evennia/objects/objects.py                    | 1 +
 evennia/scripts/scripthandler.py              | 1 +
 evennia/scripts/tickerhandler.py              | 1 +
 evennia/server/oobhandler.py                  | 1 +
 evennia/server/portal/imc2.py                 | 1 +
 evennia/server/portal/imc2lib/imc2_packets.py | 1 +
 evennia/server/portal/mccp.py                 | 1 +
 evennia/server/portal/mssp.py                 | 1 +
 evennia/server/portal/mxp.py                  | 1 +
 evennia/server/portal/naws.py                 | 1 +
 evennia/server/portal/portal.py               | 1 +
 evennia/server/portal/rss.py                  | 1 +
 evennia/server/portal/ssh.py                  | 1 +
 evennia/server/portal/telnet_oob.py           | 1 +
 evennia/server/portal/ttype.py                | 1 +
 evennia/server/server.py                      | 1 +
 evennia/server/serversession.py               | 1 +
 evennia/server/session.py                     | 1 +
 evennia/server/sessionhandler.py              | 1 +
 evennia/typeclasses/attributes.py             | 1 +
 evennia/typeclasses/models.py                 | 1 +
 evennia/typeclasses/tags.py                   | 1 +
 evennia/utils/ansi.py                         | 1 +
 evennia/utils/batchprocessors.py              | 1 +
 evennia/utils/dbserialize.py                  | 1 +
 evennia/utils/eveditor.py                     | 1 +
 evennia/utils/evform.py                       | 1 +
 evennia/utils/evmenu.py                       | 1 +
 evennia/utils/evmore.py                       | 1 +
 evennia/utils/evtable.py                      | 1 +
 evennia/utils/picklefield.py                  | 1 +
 evennia/utils/prettytable.py                  | 1 +
 evennia/utils/text2html.py                    | 1 +
 evennia/utils/utils.py                        | 1 +
 43 files changed, 43 insertions(+)

diff --git a/evennia/__init__.py b/evennia/__init__.py
index ad0506d7ab..344832aea2 100644
--- a/evennia/__init__.py
+++ b/evennia/__init__.py
@@ -13,6 +13,7 @@ See www.evennia.com for full documentation.
 """
 from __future__ import print_function
 from __future__ import absolute_import
+from builtins import object
 
 # Delayed loading of properties
 
diff --git a/evennia/commands/cmdsethandler.py b/evennia/commands/cmdsethandler.py
index 6fb0c83915..3d59be4795 100644
--- a/evennia/commands/cmdsethandler.py
+++ b/evennia/commands/cmdsethandler.py
@@ -63,6 +63,7 @@ can then implement separate sets for different situations. For
 example, you can have a 'On a boat' set, onto which you then tack on
 the 'Fishing' set. Fishing from a boat? No problem!
 """
+from builtins import object
 import sys
 from importlib import import_module
 from inspect import trace
diff --git a/evennia/comms/channelhandler.py b/evennia/comms/channelhandler.py
index fa862cb734..dce47ee241 100644
--- a/evennia/comms/channelhandler.py
+++ b/evennia/comms/channelhandler.py
@@ -23,6 +23,7 @@ update() on the channelhandler. Or use Channel.objects.delete() which
 does this for you.
 
 """
+from builtins import object
 
 from evennia.comms.models import ChannelDB
 from evennia.commands import cmdset, command
diff --git a/evennia/comms/models.py b/evennia/comms/models.py
index d3feece983..4305edffef 100644
--- a/evennia/comms/models.py
+++ b/evennia/comms/models.py
@@ -17,6 +17,7 @@ Channels are central objects that act as targets for Msgs. Players can
 connect to channels by use of a ChannelConnect object (this object is
 necessary to easily be able to delete connections on the fly).
 """
+from builtins import object
 
 from django.conf import settings
 from django.utils import timezone
diff --git a/evennia/contrib/barter.py b/evennia/contrib/barter.py
index c91b639418..578a9f5dcb 100644
--- a/evennia/contrib/barter.py
+++ b/evennia/contrib/barter.py
@@ -94,6 +94,7 @@ in-game.
 
 """
 from __future__ import print_function
+from builtins import object
 
 from evennia import Command, DefaultScript, CmdSet
 
diff --git a/evennia/contrib/menusystem.py b/evennia/contrib/menusystem.py
index 3bc52c2fe7..b72286f67e 100644
--- a/evennia/contrib/menusystem.py
+++ b/evennia/contrib/menusystem.py
@@ -40,6 +40,7 @@ example of usage.
 For a simple demonstration, add `CmdMenuTest` from this module to the default cmdset.
 
 """
+from builtins import object
 from types import MethodType
 from evennia import syscmdkeys
 
diff --git a/evennia/contrib/rpsystem.py b/evennia/contrib/rpsystem.py
index 94f19e9772..065506db10 100644
--- a/evennia/contrib/rpsystem.py
+++ b/evennia/contrib/rpsystem.py
@@ -69,6 +69,7 @@ Tall man (assuming his name is Tom) sees:
 
 
 """
+from builtins import object
 
 import re
 from re import escape as re_escape
diff --git a/evennia/locks/lockhandler.py b/evennia/locks/lockhandler.py
index 413d2740a8..eca347a79c 100644
--- a/evennia/locks/lockhandler.py
+++ b/evennia/locks/lockhandler.py
@@ -104,6 +104,7 @@ to any other identifier you can use.
 
 """
 from __future__ import print_function
+from builtins import object
 
 import re
 import inspect
diff --git a/evennia/objects/models.py b/evennia/objects/models.py
index fc353e50f9..82f0246084 100644
--- a/evennia/objects/models.py
+++ b/evennia/objects/models.py
@@ -13,6 +13,7 @@ Attributes are separate objects that store values persistently onto
 the database object. Like everything else, they can be accessed
 transparently through the decorating TypeClass.
 """
+from builtins import object
 
 from django.conf import settings
 from django.db import models
diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index 1672a5697d..54f15a66ba 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -5,6 +5,7 @@ These are the (default) starting points for all in-game visible
 entities.
 
 """
+from builtins import object
 
 import traceback
 from django.conf import settings
diff --git a/evennia/scripts/scripthandler.py b/evennia/scripts/scripthandler.py
index 16c5fbb76c..474c3c6697 100644
--- a/evennia/scripts/scripthandler.py
+++ b/evennia/scripts/scripthandler.py
@@ -5,6 +5,7 @@ added to all game objects. You access it through the property
 `scripts` on the game object.
 
 """
+from builtins import object
 
 from evennia.scripts.models import ScriptDB
 from evennia.utils import create
diff --git a/evennia/scripts/tickerhandler.py b/evennia/scripts/tickerhandler.py
index 24370b8d7e..70ba0fff50 100644
--- a/evennia/scripts/tickerhandler.py
+++ b/evennia/scripts/tickerhandler.py
@@ -54,6 +54,7 @@ a  custom handler one can make a custom `AT_STARTSTOP_MODULE` entry to
 call the handler's `save()` and `restore()` methods when the server reboots.
 
 """
+from builtins import object
 from twisted.internet.defer import inlineCallbacks
 from django.core.exceptions import ObjectDoesNotExist
 from evennia.scripts.scripts import ExtendedLoopingCall
diff --git a/evennia/server/oobhandler.py b/evennia/server/oobhandler.py
index bcf4e21af8..97f17ee802 100644
--- a/evennia/server/oobhandler.py
+++ b/evennia/server/oobhandler.py
@@ -11,6 +11,7 @@ the oobhandler's functionality to return data, register a monitor on
 an object's properties or start a repeating action.
 
 """
+from builtins import object
 
 from collections import defaultdict
 from django.conf import settings
diff --git a/evennia/server/portal/imc2.py b/evennia/server/portal/imc2.py
index ca075d0858..17beb8adce 100644
--- a/evennia/server/portal/imc2.py
+++ b/evennia/server/portal/imc2.py
@@ -1,6 +1,7 @@
 """
 IMC2 client module. Handles connecting to and communicating with an IMC2 server.
 """
+from builtins import object
 
 from time import time
 from twisted.internet import task
diff --git a/evennia/server/portal/imc2lib/imc2_packets.py b/evennia/server/portal/imc2lib/imc2_packets.py
index 179252478a..f4d8dede3f 100644
--- a/evennia/server/portal/imc2lib/imc2_packets.py
+++ b/evennia/server/portal/imc2lib/imc2_packets.py
@@ -4,6 +4,7 @@ http://www.mudbytes.net/index.php?a=articles&s=imc2_protocol
 
 """
 from __future__ import print_function
+from builtins import object
 import shlex
 from django.conf import settings
 
diff --git a/evennia/server/portal/mccp.py b/evennia/server/portal/mccp.py
index 32e97e6384..b7e87206c0 100644
--- a/evennia/server/portal/mccp.py
+++ b/evennia/server/portal/mccp.py
@@ -14,6 +14,7 @@ terribly slow connection.
 This protocol is implemented by the telnet protocol importing
 mccp_compress and calling it from its write methods.
 """
+from builtins import object
 import zlib
 
 # negotiations for v1 and v2 of the protocol
diff --git a/evennia/server/portal/mssp.py b/evennia/server/portal/mssp.py
index 821d0a75ca..62a8805ec2 100644
--- a/evennia/server/portal/mssp.py
+++ b/evennia/server/portal/mssp.py
@@ -10,6 +10,7 @@ active players and so on.
 
 
 """
+from builtins import object
 from django.conf import settings
 from evennia.utils import utils
 
diff --git a/evennia/server/portal/mxp.py b/evennia/server/portal/mxp.py
index 051d9b7abd..7fd3fe1b5b 100644
--- a/evennia/server/portal/mxp.py
+++ b/evennia/server/portal/mxp.py
@@ -13,6 +13,7 @@ http://www.mushclient.com/mushclient/mxp.htm
 http://www.gammon.com.au/mushclient/addingservermxp.htm
 
 """
+from builtins import object
 import re
 
 LINKS_SUB =  re.compile(r'\{lc(.*?)\{lt(.*?)\{le', re.DOTALL)
diff --git a/evennia/server/portal/naws.py b/evennia/server/portal/naws.py
index 7aa6b40228..5876310596 100644
--- a/evennia/server/portal/naws.py
+++ b/evennia/server/portal/naws.py
@@ -9,6 +9,7 @@ NAWS allows telnet clients to report their current window size to the
 client and update it when the size changes
 
 """
+from builtins import object
 from django.conf import settings
 
 NAWS = chr(31)
diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py
index b1f7eb4f2d..db10ffd50c 100644
--- a/evennia/server/portal/portal.py
+++ b/evennia/server/portal/portal.py
@@ -8,6 +8,7 @@ by game/evennia.py).
 
 """
 from __future__ import print_function
+from builtins import object
 
 import time
 import sys
diff --git a/evennia/server/portal/rss.py b/evennia/server/portal/rss.py
index 061b305c0d..b932affca9 100644
--- a/evennia/server/portal/rss.py
+++ b/evennia/server/portal/rss.py
@@ -5,6 +5,7 @@ This connects an RSS feed to an in-game Evennia channel, sending messages
 to the channel whenever the feed updates.
 
 """
+from builtins import object
 
 from twisted.internet import task, threads
 from django.conf import settings
diff --git a/evennia/server/portal/ssh.py b/evennia/server/portal/ssh.py
index e60f139da4..ef6c408af7 100644
--- a/evennia/server/portal/ssh.py
+++ b/evennia/server/portal/ssh.py
@@ -9,6 +9,7 @@ Using standard ssh client,
 
 """
 from __future__ import print_function
+from builtins import object
 import os
 
 from twisted.cred.checkers import credentials
diff --git a/evennia/server/portal/telnet_oob.py b/evennia/server/portal/telnet_oob.py
index 708158793f..f46905730e 100644
--- a/evennia/server/portal/telnet_oob.py
+++ b/evennia/server/portal/telnet_oob.py
@@ -18,6 +18,7 @@ for updating health bars etc. See also GMCP which is another standard
 doing the same thing.
 
 """
+from builtins import object
 import re
 import json
 from evennia.utils.utils import to_str
diff --git a/evennia/server/portal/ttype.py b/evennia/server/portal/ttype.py
index fc54c53609..5d861d1948 100644
--- a/evennia/server/portal/ttype.py
+++ b/evennia/server/portal/ttype.py
@@ -10,6 +10,7 @@ etc. If the client does not support TTYPE, this will be ignored.
 All data will be stored on the protocol's protocol_flags dictionary,
 under the 'TTYPE' key.
 """
+from builtins import object
 
 # telnet option codes
 TTYPE = chr(24)
diff --git a/evennia/server/server.py b/evennia/server/server.py
index 64ea1bad39..b3d09944ee 100644
--- a/evennia/server/server.py
+++ b/evennia/server/server.py
@@ -8,6 +8,7 @@ by game/evennia.py).
 
 """
 from __future__ import print_function
+from builtins import object
 import time
 import sys
 import os
diff --git a/evennia/server/serversession.py b/evennia/server/serversession.py
index 66f930e46b..ca3f8e41f6 100644
--- a/evennia/server/serversession.py
+++ b/evennia/server/serversession.py
@@ -6,6 +6,7 @@ connection actually happens (so it's the same for telnet, web, ssh etc).
 It is stored on the Server side (as opposed to protocol-specific sessions which
 are stored on the Portal side)
 """
+from builtins import object
 
 import re
 import weakref
diff --git a/evennia/server/session.py b/evennia/server/session.py
index 02e7c507c4..16a2d2c27e 100644
--- a/evennia/server/session.py
+++ b/evennia/server/session.py
@@ -3,6 +3,7 @@ This module defines a generic session class. All connection instances
 (both on Portal and Server side) should inherit from this class.
 
 """
+from builtins import object
 
 import time
 
diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py
index c2b80d5078..b1b50c2037 100644
--- a/evennia/server/sessionhandler.py
+++ b/evennia/server/sessionhandler.py
@@ -12,6 +12,7 @@ There are two similar but separate stores of sessions:
          handle network communication but holds no game info.
 
 """
+from builtins import object
 
 from time import time
 from django.conf import settings
diff --git a/evennia/typeclasses/attributes.py b/evennia/typeclasses/attributes.py
index a8f2e7719d..207bcee518 100644
--- a/evennia/typeclasses/attributes.py
+++ b/evennia/typeclasses/attributes.py
@@ -8,6 +8,7 @@ which is a non-db version of Attributes.
 
 
 """
+from builtins import object
 import re
 import weakref
 
diff --git a/evennia/typeclasses/models.py b/evennia/typeclasses/models.py
index 79550f9946..55f8707193 100644
--- a/evennia/typeclasses/models.py
+++ b/evennia/typeclasses/models.py
@@ -25,6 +25,7 @@ This module also contains the Managers for the respective models; inherit from
 these to create custom managers.
 
 """
+from builtins import object
 
 from django.db.models import signals
 
diff --git a/evennia/typeclasses/tags.py b/evennia/typeclasses/tags.py
index 2d6212fb10..d3f9486c9b 100644
--- a/evennia/typeclasses/tags.py
+++ b/evennia/typeclasses/tags.py
@@ -9,6 +9,7 @@ used for storing Aliases and Permissions. This module contains the
 respective handlers.
 
 """
+from builtins import object
 
 from django.conf import settings
 from django.db import models
diff --git a/evennia/utils/ansi.py b/evennia/utils/ansi.py
index 48055d2aae..f496e3c3b4 100644
--- a/evennia/utils/ansi.py
+++ b/evennia/utils/ansi.py
@@ -13,6 +13,7 @@ it is run by Evennia just before returning data to/from the
 user.
 
 """
+from builtins import object
 import re
 from evennia.utils import utils
 from evennia.utils.utils import to_str, to_unicode
diff --git a/evennia/utils/batchprocessors.py b/evennia/utils/batchprocessors.py
index 5ab3b2af0b..a4f6fb116e 100644
--- a/evennia/utils/batchprocessors.py
+++ b/evennia/utils/batchprocessors.py
@@ -167,6 +167,7 @@ caller.msg("The object was created!")
 script = create.create_script()
 ```
 """
+from builtins import object
 
 import re
 import codecs
diff --git a/evennia/utils/dbserialize.py b/evennia/utils/dbserialize.py
index 9f2081d566..4cc78a8fb9 100644
--- a/evennia/utils/dbserialize.py
+++ b/evennia/utils/dbserialize.py
@@ -18,6 +18,7 @@ in-situ, e.g `obj.db.mynestedlist[3][5] = 3` would never be saved and
 be out of sync with the database.
 
 """
+from builtins import object
 
 from functools import update_wrapper
 from collections import defaultdict, MutableSequence, MutableSet, MutableMapping
diff --git a/evennia/utils/eveditor.py b/evennia/utils/eveditor.py
index 5d50755b97..d293577e1e 100644
--- a/evennia/utils/eveditor.py
+++ b/evennia/utils/eveditor.py
@@ -33,6 +33,7 @@ and initialize it:
    displayed in the editor.
 
 """
+from builtins import object
 
 import re
 from django.conf import settings
diff --git a/evennia/utils/evform.py b/evennia/utils/evform.py
index 29f2398bb3..4f798756ef 100644
--- a/evennia/utils/evform.py
+++ b/evennia/utils/evform.py
@@ -135,6 +135,7 @@ form will raise an error.
 
 """
 from __future__ import print_function
+from builtins import object
 
 import re
 import copy
diff --git a/evennia/utils/evmenu.py b/evennia/utils/evmenu.py
index 4bead54aeb..424fd01670 100644
--- a/evennia/utils/evmenu.py
+++ b/evennia/utils/evmenu.py
@@ -134,6 +134,7 @@ evennia.utils.evmenu`.
 
 """
 from __future__ import print_function
+from builtins import object
 
 from textwrap import dedent
 from inspect import isfunction, getargspec
diff --git a/evennia/utils/evmore.py b/evennia/utils/evmore.py
index 98f4f43f46..527f9bb516 100644
--- a/evennia/utils/evmore.py
+++ b/evennia/utils/evmore.py
@@ -25,6 +25,7 @@ long enough to need to scroll and **kwargs will be passed on to the
 caller.msg() construct (text will be using the pager restrictor).
 
 """
+from builtins import object
 
 from django.conf import settings
 from evennia import Command, CmdSet
diff --git a/evennia/utils/evtable.py b/evennia/utils/evtable.py
index 8ba8f02507..0d3679a1bf 100644
--- a/evennia/utils/evtable.py
+++ b/evennia/utils/evtable.py
@@ -115,6 +115,7 @@ table string.
 
 """
 from __future__ import print_function
+from builtins import object
 #from textwrap import wrap
 from django.conf import settings
 from textwrap import TextWrapper
diff --git a/evennia/utils/picklefield.py b/evennia/utils/picklefield.py
index 7a3ba70cb4..a252175a89 100644
--- a/evennia/utils/picklefield.py
+++ b/evennia/utils/picklefield.py
@@ -28,6 +28,7 @@ Pickle field implementation for Django.
 Modified for Evennia by Griatch.
 
 """
+from builtins import object
 from ast import literal_eval
 
 from copy import deepcopy
diff --git a/evennia/utils/prettytable.py b/evennia/utils/prettytable.py
index aac77137b8..63ebdbc73a 100644
--- a/evennia/utils/prettytable.py
+++ b/evennia/utils/prettytable.py
@@ -30,6 +30,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 from __future__ import print_function
+from builtins import object
 __version__ = "trunk"
 
 import copy
diff --git a/evennia/utils/text2html.py b/evennia/utils/text2html.py
index 2a5e36e1cf..4cce54de5d 100644
--- a/evennia/utils/text2html.py
+++ b/evennia/utils/text2html.py
@@ -9,6 +9,7 @@ snippet #577349 on http://code.activestate.com.
 (extensively modified by Griatch 2010)
 """
 from __future__ import absolute_import
+from builtins import object
 
 import re
 import cgi
diff --git a/evennia/utils/utils.py b/evennia/utils/utils.py
index aa1fcbafe4..1540b2b1f5 100644
--- a/evennia/utils/utils.py
+++ b/evennia/utils/utils.py
@@ -7,6 +7,7 @@ be of use when designing your own game.
 """
 from __future__ import division
 from __future__ import print_function
+from builtins import object
 
 import os
 import sys