* unexelf.c (unexec): Name an expression,

[bpt/emacs.git] / etc / emacs3.py

diff --git a/etc/emacs3.py b/etc/emacs3.py
index fd2e7c9..470547b 100644 (file)
--- a/etc/emacs3.py
+++ b/etc/emacs3.py
@@ -1,11 +1,4 @@
-"""
-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.
+# Copyright (C) 2004-2011  Free Software Foundation, Inc.
 # Author: Dave Love <fx@gnu.org>
 
 # This file is part of GNU Emacs.
@@ -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:
@@ -239,4 +232,3 @@ Assumes that MODULE.py and MODULE.pyc are in the same directory."""
 
 # print '_emacs_ok'             # ready for input and can call continuation
 
-# arch-tag: 37bfed38-5f4a-4027-a2bf-d5f41819dd89