From: Alex Harsanyi <harsanyi@mac.com>
Date: Sun, 22 Aug 2010 23:50:38 +0000 (-0400)
Subject: * emacs3.py: Import imp module and use it (Bug#5756).
X-Git-Tag: emacs-pretest-23.2.90~139^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8f0aff6cd7301e1399563dff793881f70fd7dbd;p=emacs.git

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

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 456033af1c9..f6166ef8a5f 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/etc/emacs3.py b/etc/emacs3.py
index fd2e7c97c53..de81848e5c3 100644
--- a/etc/emacs3.py
+++ b/etc/emacs3.py
@@ -1,10 +1,3 @@
-"""
-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 @@ Warning: This file is automatically generated from emacs2.py with the
 # 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: