[Python-checkins] cpython (merge default -> default): Merge heads.

Sun Aug 24 00:25:18 CEST 2014

http://hg.python.org/cpython/rev/ff1acecf0636
changeset: 92209:ff1acecf0636
parent: 92203:1c48171fc8da
parent: 92206:5bab20c27089
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Sat Aug 23 18:23:50 2014 -0400
summary:
 Merge heads.
files:
 Lib/idlelib/ColorDelegator.py | 1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/Lib/idlelib/ColorDelegator.py b/Lib/idlelib/ColorDelegator.py
--- a/Lib/idlelib/ColorDelegator.py
+++ b/Lib/idlelib/ColorDelegator.py
@@ -39,7 +39,6 @@
 Delegator.__init__(self)
 self.prog = prog
 self.idprog = idprog
- self.asprog = asprog
 self.LoadTagDefs()
 
 def setdelegate(self, delegate):
-- 
Repository URL: http://hg.python.org/cpython
