Skip to content

Commit 36e0a92

Browse files
gvanrossumgvanrossum
committed
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] ........ ................
1 parent f66263c commit 36e0a92

41 files changed

Lines changed: 143 additions & 137 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Doc/lib/libwave.tex‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ \subsection{Wave_write Objects \label{Wave-write-objects}}
142142

143143
\begin{methoddesc}[Wave_write]{setcomptype}{type, name}
144144
Set the compression type and description.
145+
At the moment, only compression type \samp{NONE} is supported,
146+
meaning no compression.
145147
\end{methoddesc}
146148

147149
\begin{methoddesc}[Wave_write]{setparams}{tuple}

‎Lib/idlelib/AutoComplete.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
import sys
88
import string
99

10-
from configHandler import idleConf
11-
12-
import AutoCompleteWindow
13-
from HyperParser import HyperParser
10+
from .configHandler import idleConf
11+
from . import AutoCompleteWindow
12+
from .HyperParser import HyperParser
1413

1514
import __main__
1615

‎Lib/idlelib/AutoCompleteWindow.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
An auto-completion window for IDLE, used by the AutoComplete extension
33
"""
44
from Tkinter import *
5-
from MultiCall import MC_SHIFT
6-
import AutoComplete
5+
from .MultiCall import MC_SHIFT
6+
import idlelib.AutoComplete
77

88
HIDE_VIRTUAL_EVENT_NAME = "<<autocompletewindow-hide>>"
99
HIDE_SEQUENCES = ("<FocusOut>", "<ButtonPress>")

‎Lib/idlelib/Bindings.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
1010
"""
1111
import sys
12-
from configHandler import idleConf
12+
from .configHandler import idleConf
1313

1414
menudefs = [
1515
# underscore prefixes character to underscore
@@ -80,7 +80,6 @@
8080
]),
8181
]
8282

83-
import sys
8483
if sys.platform == 'darwin' and '.app' in sys.executable:
8584
# Running as a proper MacOS application bundle. This block restructures
8685
# the menus a little to make them conform better to the HIG.

‎Lib/idlelib/CallTips.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import sys
1010
import types
1111

12-
import CallTipWindow
13-
from HyperParser import HyperParser
12+
from . import CallTipWindow
13+
from .HyperParser import HyperParser
1414

1515
import __main__
1616

‎Lib/idlelib/ClassBrowser.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
import sys
1515
import pyclbr
1616

17-
import PyShell
18-
from WindowList import ListedToplevel
19-
from TreeWidget import TreeNode, TreeItem, ScrolledCanvas
20-
from configHandler import idleConf
17+
from . import PyShell
18+
from .WindowList import ListedToplevel
19+
from .TreeWidget import TreeNode, TreeItem, ScrolledCanvas
20+
from .configHandler import idleConf
2121

2222
class ClassBrowser:
2323

‎Lib/idlelib/CodeContext.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
"""
1212
import Tkinter
1313
from Tkconstants import TOP, LEFT, X, W, SUNKEN
14-
from configHandler import idleConf
1514
import re
1615
from sys import maxint as INFINITY
16+
from .configHandler import idleConf
1717

1818
BLOCKOPENERS = set(["class", "def", "elif", "else", "except", "finally", "for",
1919
"if", "try", "while", "with"])

‎Lib/idlelib/ColorDelegator.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import keyword
44
import __builtin__
55
from Tkinter import *
6-
from Delegator import Delegator
7-
from configHandler import idleConf
6+
from .Delegator import Delegator
7+
from .configHandler import idleConf
88

99
DEBUG = False
1010

@@ -248,7 +248,7 @@ def removecolors(self):
248248
self.tag_remove(tag, "1.0", "end")
249249

250250
def main():
251-
from Percolator import Percolator
251+
from .Percolator import Percolator
252252
root = Tk()
253253
root.wm_protocol("WM_DELETE_WINDOW", root.quit)
254254
text = Text(background="white")

‎Lib/idlelib/Debugger.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
import bdb
33
import types
44
from Tkinter import *
5-
from WindowList import ListedToplevel
6-
from ScrolledList import ScrolledList
7-
import macosxSupport
5+
from .WindowList import ListedToplevel
6+
from .ScrolledList import ScrolledList
7+
from . import macosxSupport
88

99

1010
class Idb(bdb.Bdb):

‎Lib/idlelib/EditorWindow.py‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@
66
from Tkinter import *
77
import tkSimpleDialog
88
import tkMessageBox
9-
from MultiCall import MultiCallCreator
10-
9+
import traceback
1110
import webbrowser
12-
import idlever
13-
import WindowList
14-
import SearchDialog
15-
import GrepDialog
16-
import ReplaceDialog
17-
import PyParse
18-
from configHandler import idleConf
19-
import aboutDialog, textView, configDialog
20-
import macosxSupport
11+
12+
from .MultiCall import MultiCallCreator
13+
from . import idlever
14+
from . import WindowList
15+
from . import SearchDialog
16+
from . import GrepDialog
17+
from . import ReplaceDialog
18+
from . import PyParse
19+
from .configHandler import idleConf
20+
from . import aboutDialog, textView, configDialog
21+
from . import macosxSupport
2122

2223
# The default tab setting for a Text widget, in average-width characters.
2324
TK_TABWIDTH_DEFAULT = 8
@@ -40,13 +41,13 @@ def _find_module(fullname, path=None):
4041
return file, filename, descr
4142

4243
class EditorWindow(object):
43-
from Percolator import Percolator
44-
from ColorDelegator import ColorDelegator
45-
from UndoDelegator import UndoDelegator
46-
from IOBinding import IOBinding, filesystemencoding, encoding
47-
import Bindings
44+
from .Percolator import Percolator
45+
from .ColorDelegator import ColorDelegator
46+
from .UndoDelegator import UndoDelegator
47+
from .IOBinding import IOBinding, filesystemencoding, encoding
48+
from . import Bindings
4849
from Tkinter import Toplevel
49-
from MultiStatusBar import MultiStatusBar
50+
from .MultiStatusBar import MultiStatusBar
5051

5152
help_url = None
5253

@@ -530,11 +531,11 @@ def open_class_browser(self, event=None):
530531
return None
531532
head, tail = os.path.split(filename)
532533
base, ext = os.path.splitext(tail)
533-
import ClassBrowser
534+
from . import ClassBrowser
534535
ClassBrowser.ClassBrowser(self.flist, base, [head])
535536

536537
def open_path_browser(self, event=None):
537-
import PathBrowser
538+
from . import PathBrowser
538539
PathBrowser.PathBrowser(self.flist)
539540

540541
def gotoline(self, lineno):
@@ -860,7 +861,6 @@ def load_standard_extensions(self):
860861
self.load_extension(name)
861862
except:
862863
print("Failed to load extension", repr(name))
863-
import traceback
864864
traceback.print_exc()
865865

866866
def get_standard_extension_names(self):
@@ -871,7 +871,7 @@ def load_extension(self, name):
871871
mod = __import__(name, globals(), locals(), [])
872872
except ImportError:
873873
print("\nFailed to import extension: ", name)
874-
return
874+
raise
875875
cls = getattr(mod, name)
876876
keydefs = idleConf.GetExtensionBindings(name)
877877
if hasattr(cls, "menudefs"):

0 commit comments

Comments
 (0)