svn keywords

[plcapi.git] / PLC / API.py

diff --git a/PLC/API.py b/PLC/API.py
index 8b85bd0..c4ec4c2 100644 (file)
--- a/PLC/API.py
+++ b/PLC/API.py
@@ -6,6 +6,7 @@
 #
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 # $Id$
+# $URL$
 #
 
 import sys
@@ -83,8 +84,8 @@ except ImportError:
 from PLC.Config import Config
 from PLC.Faults import *
 import PLC.Methods
-import PLC.Accessors
 import PLC.Legacy
+import PLC.Accessors
 
 def import_deep(name):
     mod = __import__(name)
@@ -97,11 +98,12 @@ class PLCAPI:
 
     # flat list of method names
     native_methods = PLC.Methods.native_methods
+    legacy_methods = PLC.Legacy.native_methods
 
     # other_methods_map : dict {methodname: fullpath}
     # e.g. 'Accessors' -> 'PLC.Accessors.Accessors'
     other_methods_map={}
-    for subdir in [ 'Accessors', 'Legacy']:
+    for subdir in [ 'Accessors' ]:
         path="PLC."+subdir
         # scan e.g. PLC.Accessors.__all__
         pkg = __import__(path).__dict__[subdir]
@@ -110,7 +112,7 @@ class PLCAPI:
             for method in getattr(import_deep(fullpath),"methods"):
                 other_methods_map[method] = fullpath
 
-    all_methods = native_methods + other_methods_map.keys()
+    all_methods = native_methods + legacy_methods + other_methods_map.keys()
     
     def __init__(self, config = "/etc/planetlab/plc_config", encoding = "utf-8"):
         self.encoding = encoding
@@ -144,6 +146,8 @@ class PLCAPI:
             classname = method.split(".")[-1]
             if method in self.native_methods:
                 fullpath="PLC.Methods." + method
+            elif method in self.legacy_methods:
+                fullpath="PLC.Legacy." + method
             else:
                 fullpath=self.other_methods_map[method]
             module = __import__(fullpath, globals(), locals(), [classname])