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

Markup and whitespace updates

Browse source
This commit is contained in:
BlauFeuer 2017-02-20 01:47:12 -05:00 • committed by GitHub
parent 5111fb9a1e
commit f33b562cf7
1 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
evennia/utils/batchprocessors.py
View file

@ -183,12 +183,13 @@ _ENCODINGS = settings.ENCODINGS
_RE_INSERT = re.compile(r"^\#INSERT (.*)", re.MULTILINE) _RE_INSERT = re.compile(r"^\#INSERT (.*)", re.MULTILINE)
_RE_CLEANBLOCK = re.compile(r"^\#.*?$|^\s*$", re.MULTILINE) _RE_CLEANBLOCK = re.compile(r"^\#.*?$|^\s*$", re.MULTILINE)
_RE_CMD_SPLIT = re.compile(r"^\#.*?$", re.MULTILINE) _RE_CMD_SPLIT = re.compile(r"^\#.*?$", re.MULTILINE)
_RE_CODE_OR_HEADER = re.compile(r"(\A|^\#CODE|^\#HEADER).*?$(.*?)(?=^#CODE.*?$|^#HEADER.*?$|\Z)", re.MULTILINE + re.DOTALL) _RE_CODE_OR_HEADER = re.compile(r"(\A|^\#CODE|^\#HEADER).*?$(.*?)(?=^#CODE.*?$|^#HEADER.*?$|\Z)",
re.MULTILINE + re.DOTALL)
#------------------------------------------------------------ # -------------------------------------------------------------
# Helper function # Helper function
#------------------------------------------------------------ # -------------------------------------------------------------
def read_batchfile(pythonpath, file_ending='.py'): def read_batchfile(pythonpath, file_ending='.py'):
""" """
@ -212,8 +213,7 @@ def read_batchfile(pythonpath, file_ending='.py'):
""" """
# find all possible absolute paths # find all possible absolute paths
abspaths = utils.pypath_to_realpath(pythonpath, abspaths = utils.pypath_to_realpath(pythonpath, file_ending, settings.BASE_BATCHPROCESS_PATHS)
file_ending, settings.BASE_BATCHPROCESS_PATHS)
if not abspaths: if not abspaths:
raise IOError raise IOError
text = None text = None
@ -237,11 +237,11 @@ def read_batchfile(pythonpath, file_ending='.py'):
return text return text
#------------------------------------------------------------ # -------------------------------------------------------------
# #
# Batch-command processor # Batch-command processor
# #
#------------------------------------------------------------ # -------------------------------------------------------------
class BatchCommandProcessor(object): class BatchCommandProcessor(object):
""" """
@ -271,35 +271,35 @@ class BatchCommandProcessor(object):
text = "".join(read_batchfile(pythonpath, file_ending='.ev')) text = "".join(read_batchfile(pythonpath, file_ending='.ev'))
def replace_insert(match): def replace_insert(match):
"Map replace entries" """Map replace entries"""
return "\n#".join(self.parse_file(match.group(1))) return "\n#".join(self.parse_file(match.group(1)))
# insert commands from inserted files # insert commands from inserted files
text = _RE_INSERT.sub(replace_insert, text) text = _RE_INSERT.sub(replace_insert, text)
#text = re.sub(r"^\#INSERT (.*?)", replace_insert, text, flags=re.MULTILINE) # re.sub(r"^\#INSERT (.*?)", replace_insert, text, flags=re.MULTILINE)
# get all commands # get all commands
commands = _RE_CMD_SPLIT.split(text) commands = _RE_CMD_SPLIT.split(text)
#commands = re.split(r"^\#.*?$", text, flags=re.MULTILINE) # re.split(r"^\#.*?$", text, flags=re.MULTILINE)
#remove eventual newline at the end of commands # remove eventual newline at the end of commands
commands = [c.strip('\r\n') for c in commands] commands = [c.strip('\r\n') for c in commands]
commands = [c for c in commands if c] commands = [c for c in commands if c]
return commands return commands
#------------------------------------------------------------ # -------------------------------------------------------------
# #
# Batch-code processor # Batch-code processor
# #
#------------------------------------------------------------ # -------------------------------------------------------------
def tb_filename(tb): def tb_filename(tb):
"Helper to get filename from traceback" """Helper to get filename from traceback"""
return tb.tb_frame.f_code.co_filename return tb.tb_frame.f_code.co_filename
def tb_iter(tb): def tb_iter(tb):
"Traceback iterator." """Traceback iterator."""
while tb is not None: while tb is not None:
yield tb yield tb
tb = tb.tb_next tb = tb.tb_next
@ -341,7 +341,7 @@ class BatchCodeProcessor(object):
text = "".join(read_batchfile(pythonpath, file_ending='.py')) text = "".join(read_batchfile(pythonpath, file_ending='.py'))
def replace_insert(match): def replace_insert(match):
"Run parse_file on the import before sub:ing it into this file" """Run parse_file on the import before sub:ing it into this file"""
path = match.group(1) path = match.group(1)
return "# batchcode insert (%s):" % path + "\n".join(self.parse_file(path)) return "# batchcode insert (%s):" % path + "\n".join(self.parse_file(path))
@ -365,7 +365,6 @@ class BatchCodeProcessor(object):
codes = ["%s# batchcode code:\n%s" % (header, code) for code in codes] codes = ["%s# batchcode code:\n%s" % (header, code) for code in codes]
return codes return codes
def code_exec(self, code, extra_environ=None, debug=False): def code_exec(self, code, extra_environ=None, debug=False):
""" """
Execute a single code block, including imports and appending Execute a single code block, including imports and appending
@ -406,7 +405,7 @@ class BatchCodeProcessor(object):
err = "" err = ""
for iline, line in enumerate(code.split("\n")): for iline, line in enumerate(code.split("\n")):
if iline == lineno: if iline == lineno:
err += "\n{w%02i{n: %s" % (iline + 1, line) err += "\n|w%02i|n: %s" % (iline + 1, line)
elif lineno - 5 < iline < lineno + 5: elif lineno - 5 < iline < lineno + 5:
err += "\n%02i: %s" % (iline + 1, line) err += "\n%02i: %s" % (iline + 1, line)