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

Remove uses of the 'future' py2->3 module

Browse source 
This is no longer needed, now that we are Py3.7+ only. One
layer of indirection removed, and one less dependency.
This commit is contained in:
Greg Taylor 2019-09-14 23:47:00 -07:00
parent edbe583959
commit bd33886cc0
16 changed files with 26 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/utils/evtable.py
View file

@ -111,8 +111,6 @@ table string.
"""
from future.utils import listitems
from django.conf import settings
from textwrap import TextWrapper
from copy import deepcopy, copy
@ -1464,7 +1462,7 @@ class EvTable(object):
"""
# this will replace default options with new ones without changing default
options = dict(listitems(self.options) + listitems(kwargs))
options = dict(list(self.options.items()) + list(kwargs.items()))
xpos = kwargs.get("xpos", None)
column = EvColumn(*args, **options)
@ -1529,7 +1527,7 @@ class EvTable(object):
"""
# this will replace default options with new ones without changing default
row = list(args)
options = dict(listitems(self.options) + listitems(kwargs))
options = dict(list(self.options.items()) + list(kwargs.items()))
ypos = kwargs.get("ypos", None)
wtable = self.ncols