end cleanup the legacy stuff

diff --git a/Makefile b/Makefile
index d2e44b0..390d107 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@
 #
 
 # Metafiles - manage Legacy/ and Accessors by hand
-init := PLC/__init__.py PLC/Methods/__init__.py PLC/Legacy/__init__.py
+init := PLC/__init__.py PLC/Methods/__init__.py 
 
 # python-pycurl and python-psycopg2 avail. from fedora 5
 # we used to ship our own version of psycopg2 and pycurl, for fedora4
@@ -79,23 +79,8 @@ endif
 PLC/Methods/__init__.py: 
        (echo '## Please use make index to update this file' ; echo 'native_methods = """' ; cd PLC/Methods; ls -1 *.py system/*.py | grep -v __init__ | sed -e 's,.py$$,,' -e 's,system/,system.,' ; echo '""".split()') > $@
 
-########## Legacy/
-# the current content of __init__.py
-LEGACY_now := $(sort $(shell fgrep -v '"' PLC/Legacy/__init__.py 2>/dev/null))
-# what should be declared
-LEGACY_paths := $(filter-out %/__init__.py, $(wildcard PLC/Legacy/*.py))
-LEGACY_files := $(sort $(notdir $(LEGACY_paths:.py=)))
-
-ifneq ($(LEGACY_now),$(LEGACY_files))
-PLC/Legacy/__init__.py: force
-endif
-PLC/Legacy/__init__.py: 
-       (echo '## Please use make index to update this file' ; echo 'native_methods = """' ; cd PLC/Legacy; ls -1 *.py | grep -v __init__ | sed -e 's,.py$$,,' -e 's,system/,system.,' ; echo '""".split()') > $@
-
 ##########
 
-
-
 force:
 
 .PHONY: all install force clean index tags $(subdirs)

diff --git a/PLC/API.py b/PLC/API.py
index 4e75ae3..9d61ed9 100644 (file)
--- a/PLC/API.py
+++ b/PLC/API.py
@@ -97,7 +97,6 @@ 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'
@@ -111,7 +110,7 @@ class PLCAPI:
             for method in getattr(import_deep(fullpath),"methods"):
                 other_methods_map[method] = fullpath
 
-    all_methods = native_methods + legacy_methods + other_methods_map.keys()
+    all_methods = native_methods + other_methods_map.keys()
     
     def __init__(self, config = "/etc/planetlab/plc_config", encoding = "utf-8"):
         self.encoding = encoding
@@ -145,8 +144,6 @@ 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])

diff --git a/setup.py b/setup.py
index 04ac71a..a8bd7a2 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+n#!/usr/bin/python
 #
 # Setup script for PLCAPI
 #
@@ -13,7 +13,7 @@ from distutils.core import setup
 from glob import glob
 
 setup(py_modules = ['ModPython'],
-      packages = ['PLC', 'PLC/Methods', 'PLC/Methods/system', 'PLC/Accessors', 'PLC/Legacy'],
+      packages = ['PLC', 'PLC/Methods', 'PLC/Methods/system', 'PLC/Accessors', ],
       scripts = ['plcsh', 'Server.py'],
       data_files = [
         ('', ['planetlab5.sql']),