diff --git a/evennia/scripts/scripts.py b/evennia/scripts/scripts.py index 7d549d7034..ce87c39031 100644 --- a/evennia/scripts/scripts.py +++ b/evennia/scripts/scripts.py @@ -66,7 +66,7 @@ class ExtendedLoopingCall(LoopingCall): if interval < 0: raise ValueError("interval must be >= 0") self.running = True - d = self.deferred = Deferred() + deferred = self._deferred = Deferred() self.starttime = self.clock.seconds() self.interval = interval self._runAtStart = now @@ -87,7 +87,7 @@ class ExtendedLoopingCall(LoopingCall): self.interval = real_interval else: self._scheduleFrom(self.starttime) - return d + return deferred def __call__(self): """ diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py index a1faf37ad6..6d6b456c40 100644 --- a/evennia/server/evennia_launcher.py +++ b/evennia/server/evennia_launcher.py @@ -60,7 +60,7 @@ PORTAL_PY_FILE = None PYTHON_MIN = '2.7' -TWISTED_MIN = '15.2.1' +TWISTED_MIN = '16.0.0' DJANGO_MIN = '1.8' DJANGO_REC = '1.9' diff --git a/requirements.txt b/requirements.txt index 9b137123c3..d1e4790d4c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ # Evennia dependencies, for Linux/Mac platforms django >= 1.8, < 1.10 -twisted >= 15.2.1 +twisted >= 16.0.0 mock >= 1.0.1 pillow == 2.9.0 pytz diff --git a/win_requirements.txt b/win_requirements.txt index 237bb88c2c..c5269b71bc 100644 --- a/win_requirements.txt +++ b/win_requirements.txt @@ -4,7 +4,7 @@ pypiwin32 # general django >= 1.8, < 1.10 -twisted >= 15.2.1 +twisted >= 16.0.0 mock >= 1.0.1 pillow == 2.9.0 pytz