[GNUnet-SVN] r22768 - gnunet-planetlab/gplmt

[gnunet]

Author: wachs
Date: 2012-07-18 23:51:46 +0200 (Wed, 18 Jul 2012)
New Revision: 22768

Modified:
   gnunet-planetlab/gplmt/Tasks.py
   gnunet-planetlab/gplmt/Worker.py
   gnunet-planetlab/gplmt/gplmt.py
Log:
-fix imports

Modified: gnunet-planetlab/gplmt/Tasks.py
===================================================================
--- gnunet-planetlab/gplmt/Tasks.py     2012-07-18 19:38:45 UTC (rev 22767)
+++ gnunet-planetlab/gplmt/Tasks.py     2012-07-18 21:51:46 UTC (rev 22768)
@@ -21,7 +21,11 @@
 # GNUnet Planetlab deployment and automation toolset 
 #
 # Nodes
-from elementtree import ElementTree
+try: 
+    from elementtree import ElementTree
+    elementtree_loaded = True 
+except ImportError: 
+    pass
 
 glogger = None
 

Modified: gnunet-planetlab/gplmt/Worker.py
===================================================================
--- gnunet-planetlab/gplmt/Worker.py    2012-07-18 19:38:45 UTC (rev 22767)
+++ gnunet-planetlab/gplmt/Worker.py    2012-07-18 21:51:46 UTC (rev 22768)
@@ -24,9 +24,13 @@
 
 import Tasks
 import threading
-import paramiko
 import socket
 import os
+try: 
+    import paramiko
+    paramiko_loaded = True 
+except ImportError: 
+    pass
 
 # Global variables
 g_logger = None

Modified: gnunet-planetlab/gplmt/gplmt.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt.py     2012-07-18 19:38:45 UTC (rev 22767)
+++ gnunet-planetlab/gplmt/gplmt.py     2012-07-18 21:51:46 UTC (rev 22768)
@@ -22,28 +22,30 @@
 #
 # Main file
 
-import getopt;
-import sys;
-import Util;
-import Configuration;
-import Nodes;
-import Tasks;
-import Worker;
-import Notifications;
-
 # Checking dependencies
 # ElementTree XML Parser
 try: 
     from elementtree import ElementTree
     elementtree_loaded = True 
 except ImportError: 
-    elementtree_loaded = False 
-try: 
+    elementtree_loaded = False
+try:
     import paramiko
     paramiko_loaded = True 
 except ImportError: 
     paramiko_loaded = False 
 
+import getopt;
+import sys;
+import Util;
+import Configuration;
+import Nodes;
+import Tasks;
+import Worker;
+import Notifications;
+
+
+
 def main():
     global main
     main = Main ()
@@ -157,4 +159,4 @@
         self.verbose = False;
         
 if __name__ == "__main__":
-    main() 
\ No newline at end of file
+    main()