[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100000: * emacs3.py: Import imp module and use it (Bug#5756).

[Chong Yidong]

------------------------------------------------------------
revno: 100000
author: Alex Harsanyi <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sun 2010-08-22 19:50:38 -0400
message:
  * emacs3.py: Import imp module and use it (Bug#5756).
modified:
  etc/ChangeLog
  etc/emacs3.py

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2010-07-27 19:50:01 +0000
+++ b/etc/ChangeLog     2010-08-22 23:50:38 +0000
@@ -1,3 +1,7 @@
+2010-08-22  Alex Harsanyi <address@hidden>
+
+       * emacs3.py: Import imp module and use it (Bug#5756).
+
 2010-07-27  Ken Brown  <address@hidden>
 
        * PROBLEMS: Mention problem with Cygwin 1.5.19.

=== modified file 'etc/emacs3.py'
--- a/etc/emacs3.py     2010-01-13 08:35:10 +0000
+++ b/etc/emacs3.py     2010-08-22 23:50:38 +0000
@@ -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 <address@hidden>
 
@@ -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 @@
     try:
         try:
             if mod in __dict__ and inspect.ismodule (__dict__[mod]):
-                reload (__dict__[mod])
+                imp.reload (__dict__[mod])
             else:
                 __dict__[mod] = __import__ (mod)
         except: