diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | django/test/doctest.py | 7 |
2 files changed, 6 insertions, 2 deletions
@@ -154,6 +154,7 @@ answer newbie questions, and generally made Django that much better: Gary Wilson <gary.wilson@gmail.com> wojtek ye7cakf02@sneakemail.com + ymasuda@ethercube.com Cheng Zhang A big THANK YOU goes to: diff --git a/django/test/doctest.py b/django/test/doctest.py index d600d15e52..3b364f0a75 100644 --- a/django/test/doctest.py +++ b/django/test/doctest.py @@ -1319,13 +1319,16 @@ class DocTestRunner: __LINECACHE_FILENAME_RE = re.compile(r'<doctest ' r'(?P<name>[\w\.]+)' r'\[(?P<examplenum>\d+)\]>$') - def __patched_linecache_getlines(self, filename): + def __patched_linecache_getlines(self, filename, module_globals=None): m = self.__LINECACHE_FILENAME_RE.match(filename) if m and m.group('name') == self.test.name: example = self.test.examples[int(m.group('examplenum'))] return example.source.splitlines(True) else: - return self.save_linecache_getlines(filename) + if sys.version_info < (2, 5, 0): + return self.save_linecache_getlines(filename) + else: + return self.save_linecache_getlines(filename, module_globals) def run(self, test, compileflags=None, out=None, clear_globs=True): """ |