* emacs3.py: Import imp module and use it (Bug#5756).

d8f0aff6 · Alex Harsanyi · Chong Yidong · c00725d7 · d8f0aff6 · d8f0aff6
Commit d8f0aff6 authored Aug 22, 2010 by Alex Harsanyi Committed by Chong Yidong Aug 22, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 9 deletions

etc/ChangeLog etc/ChangeLog +4 -0

etc/emacs3.py etc/emacs3.py +2 -9

No files found.
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
+2010-08-22  Alex Harsanyi <harsanyi@mac.com>
+
+	* emacs3.py: Import imp module and use it (Bug#5756).
+
 2010-07-27  Ken Brown  <kbrown@cornell.edu>

 	* PROBLEMS: Mention problem with Cygwin 1.5.19.

--- a/etc/emacs3.py
+++ b/etc/emacs3.py
-"""
-Warning: This file is automatically generated from emacs2.py with the
-2to3 script.  Do not hand edit.
-"""
-
-"""Definitions used by commands sent to inferior Python in python.el."""
-
 # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 # Author: Dave Love <fx@gnu.org>

@@ -23,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

-import os, sys, traceback, inspect, __main__
+import os, sys, traceback, inspect, imp, __main__

 try:
    set
@@ -216,7 +209,7 @@ def eimport (mod, dir):
    try:
        try:
            if mod in __dict__ and inspect.ismodule (__dict__[mod]):
-                reload (__dict__[mod])
+                imp.reload (__dict__[mod])
            else:
                __dict__[mod] = __import__ (mod)
        except: