python: reorg to allow 'from simgrid import *' in scripts

[simgrid.git] / examples / python / actor-yield / actor-yield.py

diff --git a/examples/python/actor-yield/actor-yield.py b/examples/python/actor-yield/actor-yield.py
index 894a4ff..64fd3eb 100644 (file)
--- a/examples/python/actor-yield/actor-yield.py
+++ b/examples/python/actor-yield/actor-yield.py
@@ -3,7 +3,8 @@
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the license (GNU LGPL) which comes with this package.
 
-import simgrid, sys
+import sys
+from simgrid import *
 
 # This example does not much: It just spans over-polite actor that yield a large amount
 # of time before ending.
@@ -20,11 +21,11 @@ class Yielder:
         self.number_of_yields = int(args[0])
     def __call__(self):
         for i in range(self.number_of_yields):
-            simgrid.yield_()
-        simgrid.info("I yielded {:d} times. Goodbye now!".format(self.number_of_yields))
+            this_actor.yield_()
+        this_actor.info("I yielded {:d} times. Goodbye now!".format(self.number_of_yields))
 
 if __name__ == '__main__':
-    e = simgrid.Engine(sys.argv)
+    e = Engine(sys.argv)
 
     e.load_platform(sys.argv[1])             # Load the platform description
     e.register_actor("yielder", Yielder)  # Register the class representing the actors