[Moin-devel] CVS: MoinMoin/macro Include.py,1.8,1.9

[J?rgen Hermann]

Update of /cvsroot/moin/MoinMoin/macro
In directory usw-pr-cvs1:/tmp/cvs-serv13547/macro

Modified Files:
	Include.py 
Log Message:
Safer restoration of sys.stdout


Index: Include.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/macro/Include.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** Include.py	17 Apr 2002 22:19:10 -0000	1.8
--- Include.py	21 May 2002 20:57:17 -0000	1.9
***************
*** 72,78 ****
      stdout = sys.stdout
      sys.stdout = cStringIO.StringIO()
!     inc_page.send_page(macro.request, content_only=1)
!     ret = ret + sys.stdout.getvalue()
!     sys.stdout = stdout
  
      # decrement or remove include marker
--- 72,80 ----
      stdout = sys.stdout
      sys.stdout = cStringIO.StringIO()
!     try:
!         inc_page.send_page(macro.request, content_only=1)
!         ret = ret + sys.stdout.getvalue()
!     finally:
!         sys.stdout = stdout
  
      # decrement or remove include marker