test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refs #30405 -- Added ExceptionReporter._get_source().

This commit is contained in:
Hasan Ramezani 2019-10-08 23:52:00 +02:00 committed by Mariusz Felisiak
parent 6e2f05b2e3
commit e8de188c06
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
django/views/debug.py
View File

@ -341,11 +341,7 @@ class ExceptionReporter:
c = Context(self.get_traceback_data(), autoescape=False, use_l10n=False) c = Context(self.get_traceback_data(), autoescape=False, use_l10n=False)
return t.render(c) return t.render(c)
def _get_lines_from_file(self, filename, lineno, context_lines, loader=None, module_name=None): def _get_source(self, filename, loader, module_name):
"""
Return context_lines before and after lineno from file.
Return (pre_context_lineno, pre_context, context_line, post_context).
"""
source = None source = None
if hasattr(loader, 'get_source'): if hasattr(loader, 'get_source'):
try: try:
@ -360,6 +356,14 @@ class ExceptionReporter:
source = fp.read().splitlines() source = fp.read().splitlines()
except OSError: except OSError:
pass pass
return source
def _get_lines_from_file(self, filename, lineno, context_lines, loader=None, module_name=None):
"""
Return context_lines before and after lineno from file.
Return (pre_context_lineno, pre_context, context_line, post_context).
"""
source = self._get_source(filename, loader, module_name)
if source is None: if source is None:
return None, [], None, [] return None, [], None, []