summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib/Bindings.py
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-07-20 04:05:57 (GMT)
committerGuido van Rossum <guido@python.org>2007-07-20 04:05:57 (GMT)
commit36e0a92442388647afaaca188c403eee9856a8df (patch)
treef08d953497854e7380e408eed321e63e5adcc9bb /Lib/idlelib/Bindings.py
parentf66263c20a7b1f2226cd876b0ffcfbe07bd74abb (diff)
downloadcpython-36e0a92442388647afaaca188c403eee9856a8df.zip
cpython-36e0a92442388647afaaca188c403eee9856a8df.tar.gz
cpython-36e0a92442388647afaaca188c403eee9856a8df.tar.bz2
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/Bindings.py')
-rw-r--r--Lib/idlelib/Bindings.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/idlelib/Bindings.py b/Lib/idlelib/Bindings.py
index a3c9fc4..26f4497 100644
--- a/Lib/idlelib/Bindings.py
+++ b/Lib/idlelib/Bindings.py
@@ -9,7 +9,7 @@ windows.
"""
import sys
-from configHandler import idleConf
+from .configHandler import idleConf
menudefs = [
# underscore prefixes character to underscore
@@ -80,7 +80,6 @@ menudefs = [
]),
]
-import sys
if sys.platform == 'darwin' and '.app' in sys.executable:
# Running as a proper MacOS application bundle. This block restructures
# the menus a little to make them conform better to the HIG.