diff options
| author | Guido van Rossum <guido@python.org> | 2007-07-20 04:05:57 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-07-20 04:05:57 +0000 |
| commit | c3f7e2926cdc8293e85b6fdca4338a474e4db986 (patch) | |
| tree | fbbd3b585f07cbe2bd7143280f461019f86740b5 /Lib/idlelib/idle.py | |
| parent | c3bf9ef67251c82c90a4f7c606084ce324f7111d (diff) | |
| download | cpython-c3f7e2926cdc8293e85b6fdca4338a474e4db986.tar.gz | |
Merged revisions 56443-56466 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r56454 | kurt.kaiser | 2007-07-18 22:26:14 -0700 (Wed, 18 Jul 2007) | 2 lines
Make relative imports explicit for py3k
................
r56455 | kurt.kaiser | 2007-07-18 23:12:15 -0700 (Wed, 18 Jul 2007) | 2 lines
Was modifying dict during iteration.
................
r56457 | guido.van.rossum | 2007-07-19 07:33:19 -0700 (Thu, 19 Jul 2007) | 2 lines
Fix failing test.
................
r56466 | guido.van.rossum | 2007-07-19 20:58:16 -0700 (Thu, 19 Jul 2007) | 35 lines
Merged revisions 56413-56465 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r56439 | georg.brandl | 2007-07-17 23:37:55 -0700 (Tue, 17 Jul 2007) | 2 lines
Use "Unix" as platform name, not "UNIX".
........
r56441 | guido.van.rossum | 2007-07-18 10:19:14 -0700 (Wed, 18 Jul 2007) | 3 lines
SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
(Slightly tweaked for style and refcounts.)
........
r56444 | kurt.kaiser | 2007-07-18 12:58:42 -0700 (Wed, 18 Jul 2007) | 2 lines
Fix failing unicode test caused by change to ast.c at r56441
........
r56451 | georg.brandl | 2007-07-18 15:36:53 -0700 (Wed, 18 Jul 2007) | 2 lines
Add description for wave.setcomptype() values
........
r56456 | walter.doerwald | 2007-07-19 06:04:38 -0700 (Thu, 19 Jul 2007) | 3 lines
Document that codecs.lookup() returns a CodecInfo object.
(fixes SF bug #1754453).
........
r56463 | facundo.batista | 2007-07-19 16:57:38 -0700 (Thu, 19 Jul 2007) | 6 lines
Added a select.select call in the test server loop to make sure the
socket is ready to be read from before attempting a read (this
prevents an error 10035 on some Windows platforms). [GSoC - Alan
McIntyre]
........
................
Diffstat (limited to 'Lib/idlelib/idle.py')
| -rw-r--r-- | Lib/idlelib/idle.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/idlelib/idle.py b/Lib/idlelib/idle.py index 537dd5a9a7..0db5fd426e 100644 --- a/Lib/idlelib/idle.py +++ b/Lib/idlelib/idle.py @@ -3,7 +3,7 @@ try: except ImportError: # IDLE is not installed, but maybe PyShell is on sys.path: try: - import PyShell + from . import PyShell except ImportError: raise else: |