diff options
author | Berker Peksag <berker.peksag@gmail.com> | 2016-07-15 16:13:05 +0300 |
---|---|---|
committer | Berker Peksag <berker.peksag@gmail.com> | 2016-07-15 16:13:05 +0300 |
commit | eefb633becc8ba6ae7d30c04aaa01a5740b92cbb (patch) | |
tree | 6a8d976e7b8f8426f64f6b1aa848b24363e2490a /Lib/idlelib/idle_test/test_warning.py | |
parent | 771fbd629810cb7dc48e10cc7d687b313c622fbf (diff) | |
parent | e30c0dfb84728e8c3f9e2f695b64071e53e1811b (diff) | |
download | cpython-eefb633becc8ba6ae7d30c04aaa01a5740b92cbb.tar.gz |
Issue #27518: Merge from 3.5
Diffstat (limited to 'Lib/idlelib/idle_test/test_warning.py')
-rw-r--r-- | Lib/idlelib/idle_test/test_warning.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/idlelib/idle_test/test_warning.py b/Lib/idlelib/idle_test/test_warning.py index 18627ddd23..f3269f195a 100644 --- a/Lib/idlelib/idle_test/test_warning.py +++ b/Lib/idlelib/idle_test/test_warning.py @@ -1,4 +1,4 @@ -'''Test warnings replacement in PyShell.py and run.py. +'''Test warnings replacement in pyshell.py and run.py. This file could be expanded to include traceback overrides (in same two modules). If so, change name. @@ -17,9 +17,9 @@ showwarning = warnings.showwarning running_in_idle = 'idle' in showwarning.__name__ from idlelib import run -from idlelib import PyShell as shell +from idlelib import pyshell as shell -# The following was generated from PyShell.idle_formatwarning +# The following was generated from pyshell.idle_formatwarning # and checked as matching expectation. idlemsg = ''' Warning (from warnings module): |