diff --git a/evennia/__init__.py b/evennia/__init__.py index 3dd82d56f9..7aa878ee2e 100644 --- a/evennia/__init__.py +++ b/evennia/__init__.py @@ -18,8 +18,6 @@ See www.evennia.com for full documentation. """ - - # Delayed loading of properties # Typeclasses @@ -318,11 +316,6 @@ def _init(): del _EvContainer -del object -del absolute_import -del print_function - - def set_trace(debugger="auto", term_size=(140, 40)): """ Helper function for running a debugger inside the Evennia event loop. diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py index 0fab151941..7c5907b222 100644 --- a/evennia/server/evennia_launcher.py +++ b/evennia/server/evennia_launcher.py @@ -11,23 +11,17 @@ Run the script with the -h flag to see usage information. """ -from builtins import input, range - import os import sys import signal import shutil import importlib +import pickle from distutils.version import LooseVersion from argparse import ArgumentParser import argparse from subprocess import Popen, check_output, call, CalledProcessError, STDOUT -try: - import cPickle as pickle -except ImportError: - import pickle - from twisted.protocols import amp from twisted.internet import reactor, endpoints import django