Mercurial > emacs
changeset 110114:1489c9287d53
* emacs3.py: Import imp module and use it (Bug#5756).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 22 Aug 2010 19:50:38 -0400 |
| parents | 3f3acfe9033c |
| children | fae81355c62c |
| files | etc/ChangeLog etc/emacs3.py |
| diffstat | 2 files changed, 6 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/ChangeLog Sun Aug 22 18:44:55 2010 -0400 +++ b/etc/ChangeLog Sun Aug 22 19:50:38 2010 -0400 @@ -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.
--- a/etc/emacs3.py Sun Aug 22 18:44:55 2010 -0400 +++ b/etc/emacs3.py Sun Aug 22 19:50:38 2010 -0400 @@ -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 @@ # 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: