From d8f0aff6cd7301e1399563dff793881f70fd7dbd Mon Sep 17 00:00:00 2001 From: Alex Harsanyi Date: Sun, 22 Aug 2010 19:50:38 -0400 Subject: [PATCH] * emacs3.py: Import imp module and use it (Bug#5756). --- etc/ChangeLog | 4 ++++ etc/emacs3.py | 11 ++--------- 2 files changed, 6 insertions(+), 9 deletions(-) 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 + + * emacs3.py: Import imp module and use it (Bug#5756). + 2010-07-27 Ken Brown * 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 @@ -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 . -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: -- 2.11.4.GIT