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

Use list* from future.utils.

Browse source 
dict.keys() -> list(dict)
dict.values() -> listvalues(dict)
dict.tems() -> listitems(dict)
This commit is contained in:
Ahmed Charles 2015-11-02 11:23:56 +00:00
parent ccd1451a02
commit 487fcdf873
11 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
evennia/utils/evtable.py
View file

@ -116,6 +116,7 @@ table string.
"""
from __future__ import print_function
from builtins import object, range
from future.utils import listitems
from django.conf import settings
from textwrap import TextWrapper
@ -1371,7 +1372,7 @@ class EvTable(object):
"""
# this will replace default options with new ones without changing default
options = dict(self.options.items() + kwargs.items())
options = dict(listitems(self.options) + listitems(kwargs))
xpos = kwargs.get("xpos", None)
column = EvColumn(*args, **options)
@ -1430,7 +1431,7 @@ class EvTable(object):
"""
# this will replace default options with new ones without changing default
row = list(args)
options = dict(self.options.items() + kwargs.items())
options = dict(listitems(self.options) + listitems(kwargs))
ypos = kwargs.get("ypos", None)
wtable = self.ncols