From 4bae5d0289c6c8a340ea6c66392ac28d3ff53be3 Mon Sep 17 00:00:00 2001
From: "Gustavo J. A. M. Carneiro" <gjc@inescporto.pt>
Date: Fri, 16 Apr 2010 15:06:54 +0100
Subject: [PATCH] Fix a couple of Python examples

---
 examples/routing/simple-routing-ping6.py | 10 +++++-----
 examples/wireless/wifi-ap.py             |  4 ----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/examples/routing/simple-routing-ping6.py b/examples/routing/simple-routing-ping6.py
index 426dc0501..2b34dd514 100644
--- a/examples/routing/simple-routing-ping6.py
+++ b/examples/routing/simple-routing-ping6.py
@@ -92,13 +92,13 @@ def main(argv):
     apps.Stop(ns3.Seconds(20.0));
 
     print "Tracing"
-    ascii = ns3.ofstream("simple-routing-ping6.tr");
-    ns3.CsmaHelper.EnableAsciiAll(ascii);
-    ns3.CsmaHelper.EnablePcapAll("simple-routing-ping6", True);
+    ascii = ns3.AsciiTraceHelper()
+    csma.EnableAsciiAll(ascii.CreateFileStream("simple-routing-ping6.tr"))
+    csma.EnablePcapAll("simple-routing-ping6", True)
 
     # Run Simulation     
-    ns3.Simulator.Run();
-    ns3.Simulator.Destroy();
+    ns3.Simulator.Run()
+    ns3.Simulator.Destroy()
 
 if __name__ == '__main__':
     import sys
diff --git a/examples/wireless/wifi-ap.py b/examples/wireless/wifi-ap.py
index 0b89e40ce..33810af1d 100644
--- a/examples/wireless/wifi-ap.py
+++ b/examples/wireless/wifi-ap.py
@@ -156,13 +156,9 @@ def main(argv):
   #   Config::Connect("/NodeList/*/DeviceList/*/Phy/Tx", MakeCallback(&PhyTxTrace));
   #   Config::Connect("/NodeList/*/DeviceList/*/Phy/State", MakeCallback(&PhyStateTrace));
 
-    ascii = ns3.ofstream("wifi-ap.tr")
-    ns3.YansWifiPhyHelper.EnableAsciiAll(ascii)
 
     ns3.Simulator.Run()
-
     ns3.Simulator.Destroy()
-    ascii.close()
 
     return 0