| 
									
										
											  
											
												Merged revisions 56443-56466 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
  r56454 | kurt.kaiser | 2007-07-18 22:26:14 -0700 (Wed, 18 Jul 2007) | 2 lines
  Make relative imports explicit for py3k
................
  r56455 | kurt.kaiser | 2007-07-18 23:12:15 -0700 (Wed, 18 Jul 2007) | 2 lines
  Was modifying dict during iteration.
................
  r56457 | guido.van.rossum | 2007-07-19 07:33:19 -0700 (Thu, 19 Jul 2007) | 2 lines
  Fix failing test.
................
  r56466 | guido.van.rossum | 2007-07-19 20:58:16 -0700 (Thu, 19 Jul 2007) | 35 lines
  Merged revisions 56413-56465 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk
  ........
    r56439 | georg.brandl | 2007-07-17 23:37:55 -0700 (Tue, 17 Jul 2007) | 2 lines
    Use "Unix" as platform name, not "UNIX".
  ........
    r56441 | guido.van.rossum | 2007-07-18 10:19:14 -0700 (Wed, 18 Jul 2007) | 3 lines
    SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
    (Slightly tweaked for style and refcounts.)
  ........
    r56444 | kurt.kaiser | 2007-07-18 12:58:42 -0700 (Wed, 18 Jul 2007) | 2 lines
    Fix failing unicode test caused by change to ast.c at r56441
  ........
    r56451 | georg.brandl | 2007-07-18 15:36:53 -0700 (Wed, 18 Jul 2007) | 2 lines
    Add description for wave.setcomptype() values
  ........
    r56456 | walter.doerwald | 2007-07-19 06:04:38 -0700 (Thu, 19 Jul 2007) | 3 lines
    Document that codecs.lookup() returns a CodecInfo object.
    (fixes SF bug #1754453).
  ........
    r56463 | facundo.batista | 2007-07-19 16:57:38 -0700 (Thu, 19 Jul 2007) | 6 lines
    Added a select.select call in the test server loop to make sure the
    socket is ready to be read from before attempting a read (this
    prevents an error 10035 on some Windows platforms). [GSoC - Alan
    McIntyre]
  ........
................
											
										 
											2007-07-20 04:05:57 +00:00
										 |  |  | from .WidgetRedirector import WidgetRedirector | 
					
						
							|  |  |  | from .Delegator import Delegator | 
					
						
							| 
									
										
										
										
											2000-08-15 01:13:23 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | class Percolator: | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def __init__(self, text): | 
					
						
							|  |  |  |         # XXX would be nice to inherit from Delegator | 
					
						
							|  |  |  |         self.text = text | 
					
						
							|  |  |  |         self.redir = WidgetRedirector(text) | 
					
						
							|  |  |  |         self.top = self.bottom = Delegator(text) | 
					
						
							|  |  |  |         self.bottom.insert = self.redir.register("insert", self.insert) | 
					
						
							|  |  |  |         self.bottom.delete = self.redir.register("delete", self.delete) | 
					
						
							|  |  |  |         self.filters = [] | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def close(self): | 
					
						
							|  |  |  |         while self.top is not self.bottom: | 
					
						
							|  |  |  |             self.removefilter(self.top) | 
					
						
							|  |  |  |         self.top = None | 
					
						
							|  |  |  |         self.bottom.setdelegate(None); self.bottom = None | 
					
						
							|  |  |  |         self.redir.close(); self.redir = None | 
					
						
							|  |  |  |         self.text = None | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def insert(self, index, chars, tags=None): | 
					
						
							|  |  |  |         # Could go away if inheriting from Delegator | 
					
						
							|  |  |  |         self.top.insert(index, chars, tags) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def delete(self, index1, index2=None): | 
					
						
							|  |  |  |         # Could go away if inheriting from Delegator | 
					
						
							|  |  |  |         self.top.delete(index1, index2) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def insertfilter(self, filter): | 
					
						
							|  |  |  |         # Perhaps rename to pushfilter()? | 
					
						
							|  |  |  |         assert isinstance(filter, Delegator) | 
					
						
							|  |  |  |         assert filter.delegate is None | 
					
						
							|  |  |  |         filter.setdelegate(self.top) | 
					
						
							|  |  |  |         self.top = filter | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def removefilter(self, filter): | 
					
						
							|  |  |  |         # XXX Perhaps should only support popfilter()? | 
					
						
							|  |  |  |         assert isinstance(filter, Delegator) | 
					
						
							|  |  |  |         assert filter.delegate is not None | 
					
						
							|  |  |  |         f = self.top | 
					
						
							|  |  |  |         if f is filter: | 
					
						
							|  |  |  |             self.top = filter.delegate | 
					
						
							|  |  |  |             filter.setdelegate(None) | 
					
						
							|  |  |  |         else: | 
					
						
							|  |  |  |             while f.delegate is not filter: | 
					
						
							|  |  |  |                 assert f is not self.bottom | 
					
						
							|  |  |  |                 f.resetcache() | 
					
						
							|  |  |  |                 f = f.delegate | 
					
						
							|  |  |  |             f.setdelegate(filter.delegate) | 
					
						
							|  |  |  |             filter.setdelegate(None) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | def main(): | 
					
						
							|  |  |  |     class Tracer(Delegator): | 
					
						
							|  |  |  |         def __init__(self, name): | 
					
						
							|  |  |  |             self.name = name | 
					
						
							|  |  |  |             Delegator.__init__(self, None) | 
					
						
							|  |  |  |         def insert(self, *args): | 
					
						
							| 
									
										
										
										
											2007-02-09 05:37:30 +00:00
										 |  |  |             print(self.name, ": insert", args) | 
					
						
							| 
									
										
										
										
											2003-07-09 18:48:24 +00:00
										 |  |  |             self.delegate.insert(*args) | 
					
						
							| 
									
										
										
										
											2000-08-15 01:13:23 +00:00
										 |  |  |         def delete(self, *args): | 
					
						
							| 
									
										
										
										
											2007-02-09 05:37:30 +00:00
										 |  |  |             print(self.name, ": delete", args) | 
					
						
							| 
									
										
										
										
											2003-07-09 18:48:24 +00:00
										 |  |  |             self.delegate.delete(*args) | 
					
						
							| 
									
										
										
										
											2000-08-15 01:13:23 +00:00
										 |  |  |     root = Tk() | 
					
						
							|  |  |  |     root.wm_protocol("WM_DELETE_WINDOW", root.quit) | 
					
						
							|  |  |  |     text = Text() | 
					
						
							|  |  |  |     text.pack() | 
					
						
							|  |  |  |     text.focus_set() | 
					
						
							|  |  |  |     p = Percolator(text) | 
					
						
							|  |  |  |     t1 = Tracer("t1") | 
					
						
							|  |  |  |     t2 = Tracer("t2") | 
					
						
							|  |  |  |     p.insertfilter(t1) | 
					
						
							|  |  |  |     p.insertfilter(t2) | 
					
						
							|  |  |  |     root.mainloop() | 
					
						
							|  |  |  |     p.removefilter(t2) | 
					
						
							|  |  |  |     root.mainloop() | 
					
						
							|  |  |  |     p.insertfilter(t2) | 
					
						
							|  |  |  |     p.removefilter(t1) | 
					
						
							|  |  |  |     root.mainloop() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | if __name__ == "__main__": | 
					
						
							| 
									
										
										
										
											2001-07-13 20:00:15 +00:00
										 |  |  |     from Tkinter import * | 
					
						
							| 
									
										
										
										
											2000-08-15 01:13:23 +00:00
										 |  |  |     main() |