diff options
| author | PJ Eby <distutils-sig@python.org> | 2006-09-20 20:22:04 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2006-09-20 20:22:04 +0000 |
| commit | 7e0489e508d6f3edeb525c05f1c84f19b94361a6 (patch) | |
| tree | 892f17c3cc06c3636bacfbb21f1a6ada63754f14 /setuptools/tests/doctest.py | |
| parent | 7231e48929b6f4026bb14307185a5837bda115fa (diff) | |
| download | external_python_setuptools-7e0489e508d6f3edeb525c05f1c84f19b94361a6.tar.gz external_python_setuptools-7e0489e508d6f3edeb525c05f1c84f19b94361a6.tar.bz2 external_python_setuptools-7e0489e508d6f3edeb525c05f1c84f19b94361a6.zip | |
Backport some Python 2.5 compatibility work
--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4051932
Diffstat (limited to 'setuptools/tests/doctest.py')
| -rw-r--r-- | setuptools/tests/doctest.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/setuptools/tests/doctest.py b/setuptools/tests/doctest.py index fcaf3a4d..bffce58f 100644 --- a/setuptools/tests/doctest.py +++ b/setuptools/tests/doctest.py @@ -1330,11 +1330,13 @@ 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) + elif self.save_linecache_getlines.func_code.co_argcount>1: + return self.save_linecache_getlines(filename, module_globals) else: return self.save_linecache_getlines(filename) |