]> granicus.if.org Git - python/commitdiff
IDLE was relying on implicit relative imports which have gone away in
authorBrett Cannon <brett@python.org>
Sun, 15 Apr 2012 00:44:23 +0000 (20:44 -0400)
committerBrett Cannon <brett@python.org>
Sun, 15 Apr 2012 00:44:23 +0000 (20:44 -0400)
Python 3.3 thanks to importlib finishing the work in PEP 328 that
accidently got carried forward.

Lib/idlelib/EditorWindow.py

index 6a01db01253ff808f4da686f154bb28817538684..de74e58c0fb6a845499c9dfa4fb0e4d2c69fa7af 100644 (file)
@@ -1,8 +1,9 @@
-import sys
+import imp
+import importlib
 import os
 import re
 import string
-import imp
+import sys
 from tkinter import *
 import tkinter.simpledialog as tkSimpleDialog
 import tkinter.messagebox as tkMessageBox
@@ -1005,7 +1006,10 @@ class EditorWindow(object):
 
     def load_extension(self, name):
         try:
-            mod = __import__(name, globals(), locals(), [])
+            try:
+                mod = importlib.import_module('.' + name, package=__package__)
+            except ImportError:
+                mod = importlib.import_module(name)
         except ImportError:
             print("\nFailed to import extension: ", name)
             raise