Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Run 2to3.

Browse source
This commit is contained in:
Ryan Stein 2017-10-29 13:40:30 -04:00
parent a5a8d9dd57
commit 6fa280b9fd
157 changed files with 976 additions and 976 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/scripts/manager.py
View file

@ -240,9 +240,9 @@ class ScriptDBManager(TypedObjectManager):
if typeclass:
if callable(typeclass):
typeclass = u"%s.%s" % (typeclass.__module__, typeclass.__name__)
typeclass = "%s.%s" % (typeclass.__module__, typeclass.__name__)
else:
typeclass = u"%s" % typeclass
typeclass = "%s" % typeclass
# not a dbref; normal search
obj_restriction = obj and Q(db_obj=obj) or Q()

2
evennia/scripts/migrations/0001_initial.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.conf import settings

2
evennia/scripts/migrations/0002_auto_20150118_1625.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations

2
evennia/scripts/migrations/0003_checksessions_defaultscript_donothing_scriptbase_store_validatechannelhandler_validateidmappercache_.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations

12
evennia/scripts/migrations/0004_auto_20150306_1354.py
View file

@ -1,16 +1,16 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
def remove_manage_scripts(apps, schema_editor):
ScriptDB = apps.get_model("scripts", "ScriptDB")
for script in ScriptDB.objects.filter(db_typeclass_path__in=(u'evennia.scripts.scripts.CheckSessions',
u'evennia.scripts.scripts.ValidateScripts',
u'evennia.scripts.scripts.ValidateChannelHandler',
u'evennia.scripts.scripts.ValidateIdmapperCache',
u'evennia.utils.gametime.GameTime')):
for script in ScriptDB.objects.filter(db_typeclass_path__in=('evennia.scripts.scripts.CheckSessions',
'evennia.scripts.scripts.ValidateScripts',
'evennia.scripts.scripts.ValidateChannelHandler',
'evennia.scripts.scripts.ValidateIdmapperCache',
'evennia.utils.gametime.GameTime')):
script.delete()

2
evennia/scripts/migrations/0005_auto_20150306_1441.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations

12
evennia/scripts/migrations/0006_auto_20150310_2249.py
View file

@ -1,16 +1,16 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
def remove_manage_scripts(apps, schema_editor):
ScriptDB = apps.get_model("scripts", "ScriptDB")
for script in ScriptDB.objects.filter(db_typeclass_path__in=(u'src.scripts.scripts.CheckSessions',
u'src.scripts.scripts.ValidateScripts',
u'src.scripts.scripts.ValidateChannelHandler',
u'src.scripts.scripts.ValidateIdmapperCache',
u'src.utils.gametime.GameTime')):
for script in ScriptDB.objects.filter(db_typeclass_path__in=('src.scripts.scripts.CheckSessions',
'src.scripts.scripts.ValidateScripts',
'src.scripts.scripts.ValidateChannelHandler',
'src.scripts.scripts.ValidateIdmapperCache',
'src.utils.gametime.GameTime')):
script.delete()

2
evennia/scripts/migrations/0007_auto_20150403_2339.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations

2
evennia/scripts/migrations/0008_auto_20170606_1731.py
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.2 on 2017-06-06 17:31
from __future__ import unicode_literals
from django.db import migrations, models

2
evennia/scripts/migrations/0009_scriptdb_db_account.py
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.2 on 2017-07-05 17:27
from __future__ import unicode_literals
from django.db import migrations, models, connection
import django.db.models.deletion

2
evennia/scripts/migrations/0010_auto_20170705_1736.py
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.2 on 2017-07-05 17:36
from __future__ import unicode_literals
from django.db import migrations

2
evennia/scripts/migrations/0011_remove_scriptdb_db_player.py
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.2 on 2017-07-06 20:41
from __future__ import unicode_literals
from django.db import migrations, connection

2
evennia/scripts/models.py
View file

@ -141,7 +141,7 @@ class ScriptDB(TypedObject):
except AttributeError:
# deprecated ...
pass
if isinstance(value, (basestring, int)):
if isinstance(value, (str, int)):
from evennia.objects.models import ObjectDB
value = to_str(value, force_string=True)
if (value.isdigit() or value.startswith("#")):

8
evennia/scripts/monitorhandler.py
View file

@ -50,8 +50,8 @@ class MonitorHandler(object):
if self.monitors:
for obj in self.monitors:
for fieldname in self.monitors[obj]:
for idstring, (callback, persistent, kwargs) in self.monitors[obj][fieldname].iteritems():
path = "%s.%s" % (callback.__module__, callback.func_name)
for idstring, (callback, persistent, kwargs) in self.monitors[obj][fieldname].items():
path = "%s.%s" % (callback.__module__, callback.__name__)
savedata.append((obj, fieldname, idstring, path, persistent, kwargs))
savedata = dbserialize(savedata)
ServerConfig.objects.conf(key=self.savekey, value=savedata)
@ -97,7 +97,7 @@ class MonitorHandler(object):
"""
to_delete = []
if obj in self.monitors and fieldname in self.monitors[obj]:
for idstring, (callback, persistent, kwargs) in self.monitors[obj][fieldname].iteritems():
for idstring, (callback, persistent, kwargs) in self.monitors[obj][fieldname].items():
try:
callback(obj=obj, fieldname=fieldname, **kwargs)
except Exception:
@ -183,7 +183,7 @@ class MonitorHandler(object):
output = []
for obj in self.monitors:
for fieldname in self.monitors[obj]:
for idstring, (callback, persistent, kwargs) in self.monitors[obj][fieldname].iteritems():
for idstring, (callback, persistent, kwargs) in self.monitors[obj][fieldname].items():
output.append((obj, fieldname, idstring, persistent, kwargs))
return output

12
evennia/scripts/taskhandler.py
View file

@ -41,13 +41,13 @@ class TaskHandler(object):
"""
to_save = False
value = ServerConfig.objects.conf("delayed_tasks", default={})
if isinstance(value, basestring):
if isinstance(value, str):
tasks = dbunserialize(value)
else:
tasks = value
# At this point, `tasks` contains a dictionary of still-serialized tasks
for task_id, value in tasks.items():
for task_id, value in list(tasks.items()):
date, callback, args, kwargs = dbunserialize(value)
if isinstance(callback, tuple):
# `callback` can be an object and name for instance methods
@ -64,7 +64,7 @@ class TaskHandler(object):
def save(self):
"""Save the tasks in ServerConfig."""
for task_id, (date, callback, args, kwargs) in self.tasks.items():
for task_id, (date, callback, args, kwargs) in list(self.tasks.items()):
if task_id in self.to_save:
continue
@ -111,7 +111,7 @@ class TaskHandler(object):
# Choose a free task_id
safe_args = []
safe_kwargs = {}
used_ids = self.tasks.keys()
used_ids = list(self.tasks.keys())
task_id = 1
while task_id in used_ids:
task_id += 1
@ -127,7 +127,7 @@ class TaskHandler(object):
else:
safe_args.append(arg)
for key, value in kwargs.items():
for key, value in list(kwargs.items()):
try:
dbserialize(value)
except (TypeError, AttributeError):
@ -187,7 +187,7 @@ class TaskHandler(object):
"""
now = datetime.now()
for task_id, (date, callbac, args, kwargs) in self.tasks.items():
for task_id, (date, callbac, args, kwargs) in list(self.tasks.items()):
seconds = max(0, (date - now).total_seconds())
task.deferLater(reactor, seconds, self.do_task, task_id)

30
evennia/scripts/tickerhandler.py
View file

@ -113,7 +113,7 @@ class Ticker(object):
self._to_add = []
self._to_remove = []
self._is_ticking = True
for store_key, (args, kwargs) in self.subscriptions.iteritems():
for store_key, (args, kwargs) in self.subscriptions.items():
callback = yield kwargs.pop("_callback", "at_tick")
obj = yield kwargs.pop("_obj", None)
try:
@ -286,7 +286,7 @@ class TickerPool(object):
if interval and interval in self.tickers:
self.tickers[interval].stop()
else:
for ticker in self.tickers.values():
for ticker in list(self.tickers.values()):
ticker.stop()
@ -332,10 +332,10 @@ class TickerHandler(object):
outobj, outpath, outcallfunc = None, None, None
if callable(callback):
if inspect.ismethod(callback):
outobj = callback.im_self
outcallfunc = callback.im_func.func_name
outobj = callback.__self__
outcallfunc = callback.__func__.__name__
elif inspect.isfunction(callback):
outpath = "%s.%s" % (callback.__module__, callback.func_name)
outpath = "%s.%s" % (callback.__module__, callback.__name__)
outcallfunc = callback
else:
raise TypeError("%s is not a callable function or method." % callback)
@ -371,8 +371,8 @@ class TickerHandler(object):
interval = int(interval)
persistent = bool(persistent)
packed_obj = pack_dbobj(obj)
methodname = callfunc if callfunc and isinstance(callfunc, basestring) else None
outpath = path if path and isinstance(path, basestring) else None
methodname = callfunc if callfunc and isinstance(callfunc, str) else None
outpath = path if path and isinstance(path, str) else None
return (packed_obj, methodname, outpath, interval, idstring, persistent)
def save(self):
@ -386,16 +386,16 @@ class TickerHandler(object):
if self.ticker_storage:
# get the current times so the tickers can be restarted with a delay later
start_delays = dict((interval, ticker.task.next_call_time())
for interval, ticker in self.ticker_pool.tickers.items())
for interval, ticker in list(self.ticker_pool.tickers.items()))
# remove any subscriptions that lost its object in the interim
to_save = {store_key: (args, kwargs) for store_key, (args, kwargs) in self.ticker_storage.items()
to_save = {store_key: (args, kwargs) for store_key, (args, kwargs) in list(self.ticker_storage.items())
if ((store_key[1] and ("_obj" in kwargs and kwargs["_obj"].pk) and
hasattr(kwargs["_obj"], store_key[1])) or # a valid method with existing obj
store_key[2])} # a path given
# update the timers for the tickers
for store_key, (args, kwargs) in to_save.items():
for store_key, (args, kwargs) in list(to_save.items()):
interval = store_key[1]
# this is a mutable, so it's updated in-place in ticker_storage
kwargs["_start_delay"] = start_delays.get(interval, None)
@ -423,7 +423,7 @@ class TickerHandler(object):
restored_tickers = dbunserialize(restored_tickers)
self.ticker_storage = {}
for store_key, (args, kwargs) in restored_tickers.iteritems():
for store_key, (args, kwargs) in restored_tickers.items():
try:
# at this point obj is the actual object (or None) due to how
# the dbunserialize works
@ -431,7 +431,7 @@ class TickerHandler(object):
if not persistent and not server_reload:
# this ticker will not be restarted
continue
if isinstance(callfunc, basestring) and not obj:
if isinstance(callfunc, str) and not obj:
# methods must have an existing object
continue
# we must rebuild the store_key here since obj must not be
@ -562,7 +562,7 @@ class TickerHandler(object):
if interval is None:
# return dict of all, ordered by interval
return dict((interval, ticker.subscriptions)
for interval, ticker in self.ticker_pool.tickers.iteritems())
for interval, ticker in self.ticker_pool.tickers.items())
else:
# get individual interval
ticker = self.ticker_pool.tickers.get(interval, None)
@ -579,8 +579,8 @@ class TickerHandler(object):
"""
store_keys = []
for ticker in self.ticker_pool.tickers.itervalues():
for (objtup, callfunc, path, interval, idstring, persistent), (args, kwargs) in ticker.subscriptions.iteritems():
for ticker in self.ticker_pool.tickers.values():
for (objtup, callfunc, path, interval, idstring, persistent), (args, kwargs) in ticker.subscriptions.items():
store_keys.append((kwargs.get("_obj", None), callfunc, path, interval, idstring, persistent))
return store_keys