Fix py3 regression in ansi filler divisor. Resolves #1804.
This commit is contained in:
parent
ee5f4044e8
commit
f485099b7b
3 changed files with 8 additions and 6 deletions
|
|
@ -98,6 +98,7 @@ Web/Django standard initiative (@strikaco)
|
||||||
- Convert ServerConf model to store its values as a Picklefield (same as Attributes) instead of using a custom solution.
|
- Convert ServerConf model to store its values as a Picklefield (same as Attributes) instead of using a custom solution.
|
||||||
- OOB: Add support for MSDP LIST, REPORT, UNREPORT commands (re-mapped to `msdp_list`,
|
- OOB: Add support for MSDP LIST, REPORT, UNREPORT commands (re-mapped to `msdp_list`,
|
||||||
`msdp_report`, `msdp_unreport` inlinefuncs_)
|
`msdp_report`, `msdp_unreport` inlinefuncs_)
|
||||||
|
- Added `evennia.ANSIString` to flat API.
|
||||||
|
|
||||||
### Utils
|
### Utils
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -101,6 +101,7 @@ EvTable = None
|
||||||
EvForm = None
|
EvForm = None
|
||||||
EvEditor = None
|
EvEditor = None
|
||||||
EvMore = None
|
EvMore = None
|
||||||
|
ANSIString = None
|
||||||
|
|
||||||
# Handlers
|
# Handlers
|
||||||
SESSION_HANDLER = None
|
SESSION_HANDLER = None
|
||||||
|
|
@ -153,6 +154,7 @@ def _init():
|
||||||
global settings, lockfuncs, logger, utils, gametime, ansi, spawn, managers
|
global settings, lockfuncs, logger, utils, gametime, ansi, spawn, managers
|
||||||
global contrib, TICKER_HANDLER, MONITOR_HANDLER, SESSION_HANDLER, CHANNEL_HANDLER, TASK_HANDLER
|
global contrib, TICKER_HANDLER, MONITOR_HANDLER, SESSION_HANDLER, CHANNEL_HANDLER, TASK_HANDLER
|
||||||
global EvMenu, EvTable, EvForm, EvMore, EvEditor
|
global EvMenu, EvTable, EvForm, EvMore, EvEditor
|
||||||
|
global ANSIString
|
||||||
|
|
||||||
from .accounts.accounts import DefaultAccount
|
from .accounts.accounts import DefaultAccount
|
||||||
from .accounts.accounts import DefaultGuest
|
from .accounts.accounts import DefaultGuest
|
||||||
|
|
@ -203,6 +205,7 @@ def _init():
|
||||||
from .utils.evtable import EvTable
|
from .utils.evtable import EvTable
|
||||||
from .utils.evform import EvForm
|
from .utils.evform import EvForm
|
||||||
from .utils.eveditor import EvEditor
|
from .utils.eveditor import EvEditor
|
||||||
|
from .utils.ansi import ANSIString
|
||||||
|
|
||||||
# handlers
|
# handlers
|
||||||
from .scripts.tickerhandler import TICKER_HANDLER
|
from .scripts.tickerhandler import TICKER_HANDLER
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ user. Depreciated example forms are available by extending
|
||||||
the ansi mapping.
|
the ansi mapping.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
import functools
|
||||||
from builtins import object, range
|
from builtins import object, range
|
||||||
|
|
||||||
import re
|
import re
|
||||||
|
|
@ -534,8 +535,8 @@ def _spacing_preflight(func):
|
||||||
functions used for padding ANSIStrings.
|
functions used for padding ANSIStrings.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
@functools.wraps(func)
|
||||||
def wrapped(self, width, fillchar=None):
|
def wrapped(self, width=78, fillchar=None):
|
||||||
if fillchar is None:
|
if fillchar is None:
|
||||||
fillchar = " "
|
fillchar = " "
|
||||||
if (len(fillchar) != 1) or (not isinstance(fillchar, str)):
|
if (len(fillchar) != 1) or (not isinstance(fillchar, str)):
|
||||||
|
|
@ -555,7 +556,6 @@ def _query_super(func_name):
|
||||||
of ANSIString.
|
of ANSIString.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def wrapped(self, *args, **kwargs):
|
def wrapped(self, *args, **kwargs):
|
||||||
return getattr(self.clean(), func_name)(*args, **kwargs)
|
return getattr(self.clean(), func_name)(*args, **kwargs)
|
||||||
return wrapped
|
return wrapped
|
||||||
|
|
@ -566,7 +566,6 @@ def _on_raw(func_name):
|
||||||
Like query_super, but makes the operation run on the raw string.
|
Like query_super, but makes the operation run on the raw string.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def wrapped(self, *args, **kwargs):
|
def wrapped(self, *args, **kwargs):
|
||||||
args = list(args)
|
args = list(args)
|
||||||
try:
|
try:
|
||||||
|
|
@ -593,7 +592,6 @@ def _transform(func_name):
|
||||||
with the resulting string.
|
with the resulting string.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def wrapped(self, *args, **kwargs):
|
def wrapped(self, *args, **kwargs):
|
||||||
replacement_string = _query_super(func_name)(self, *args, **kwargs)
|
replacement_string = _query_super(func_name)(self, *args, **kwargs)
|
||||||
to_string = []
|
to_string = []
|
||||||
|
|
@ -1289,7 +1287,7 @@ class ANSIString(with_metaclass(ANSIMeta, str)):
|
||||||
|
|
||||||
"""
|
"""
|
||||||
remainder = _difference % 2
|
remainder = _difference % 2
|
||||||
_difference /= 2
|
_difference //= 2
|
||||||
spacing = self._filler(fillchar, _difference)
|
spacing = self._filler(fillchar, _difference)
|
||||||
result = spacing + self + spacing + self._filler(fillchar, remainder)
|
result = spacing + self + spacing + self._filler(fillchar, remainder)
|
||||||
return result
|
return result
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue