From: Victor Stinner <victor.stinner@gmail.com>
Date: Sun, 27 Sep 2015 09:19:08 +0000 (+0200)
Subject: Issue #25220: Fix Lib/test/autotest.py
X-Git-Tag: v3.6.0a1~1422
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36b3fbb0ee6e266381cec91a0a3c15fd403c3cfd;p=thirdparty%2FPython%2Fcpython.git

Issue #25220: Fix Lib/test/autotest.py
---

diff --git a/Lib/test/libregrtest/__init__.py b/Lib/test/libregrtest/__init__.py
index a882ed29605b..9f7b1c1fe25f 100644
--- a/Lib/test/libregrtest/__init__.py
+++ b/Lib/test/libregrtest/__init__.py
@@ -1,2 +1,2 @@
 from test.libregrtest.cmdline import _parse_args, RESOURCE_NAMES
-from test.libregrtest.main import main_in_temp_cwd
+from test.libregrtest.main import main, main_in_temp_cwd
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index f01cad45a792..fcc39375c031 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -11,7 +11,7 @@ import importlib
 
 import os
 import sys
-from test.libregrtest import main_in_temp_cwd
+from test.libregrtest import main, main_in_temp_cwd
 
 
 if __name__ == '__main__':