Merge branch 'master' of ssh://git.onelab.eu/git/sfa

diff --git a/.gitignore b/.gitignore
index 7936166..33b400f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,14 @@ build/*
 TAGS
 *~
 /sfa/util/version.py
-*.version
+wsdl/*.xml
+wsdl/*.wsdl
+wsdl/*.html
+sfa/client/*.version
 *.png
 *.svg
 *.out
+*.pdf
+*.pkey
+*.cert
+*.cred

diff --git a/Makefile b/Makefile
index 502c415..9d9c831 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -114,7 +114,8 @@ SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
 endif
 
-LOCAL_RSYNC_EXCLUDES   := --exclude '*.pyc' 
+LOCAL_RSYNC_EXCLUDES   += --exclude '*.pyc' 
+LOCAL_RSYNC_EXCLUDES   += --exclude '*.png' --exclude '*.svg' --exclude '*.out'
 RSYNC_EXCLUDES         := --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
 RSYNC_COND_DRY_RUN     := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC                  := rsync -a -v $(RSYNC_COND_DRY_RUN) --no-owner $(RSYNC_EXCLUDES)

diff --git a/sfa/util/method.py b/sfa/util/method.py
index 125629d..c5dc1e6 100644 (file)
--- a/sfa/util/method.py
+++ b/sfa/util/method.py
@@ -3,9 +3,6 @@
 #
 #
 
-### $Id$
-### $URL$
-
 import os, time
 from types import *
 from types import StringTypes
@@ -19,8 +16,7 @@ from sfa.util.faults import *
 from sfa.util.parameter import Parameter, Mixed, python_type, xmlrpc_type
 from sfa.trust.auth import Auth
 
-# we inherit object because we use new-style classes for legacy methods
-class Method (object):
+class Method:
     """
     Base class for all SfaAPI functions. At a minimum, all SfaAPI
     functions must define:
@@ -48,10 +44,8 @@ class Method (object):
     def call(self, *args):
         """
         Method body for all SfaAPI functions. Must override.
-
         """
-
-        return True
+        return None
 
     def __init__(self, api):
         self.name = self.__class__.__name__
@@ -76,16 +70,14 @@ class Method (object):
             if not self.api.interface or self.api.interface not in self.interfaces:
                 raise SfaInvalidAPIMethod(methodname, self.api.interface) 
 
-            # legacy code cannot be type-checked, due to the way Method.args() works
-            if not hasattr(self,"skip_typecheck"):
-                (min_args, max_args, defaults) = self.args()
-                               
-                # Check that the right number of arguments were passed in
-                if len(args) < len(min_args) or len(args) > len(max_args):
-                    raise SfaInvalidArgumentCount(len(args), len(min_args), len(max_args))
+            (min_args, max_args, defaults) = self.args()
+                       
+            # Check that the right number of arguments were passed in
+            if len(args) < len(min_args) or len(args) > len(max_args):
+                raise SfaInvalidArgumentCount(len(args), len(min_args), len(max_args))
 
-                for name, value, expected in zip(max_args, args, self.accepts):
-                    self.type_check(name, value, expected, args)
+            for name, value, expected in zip(max_args, args, self.accepts):
+                self.type_check(name, value, expected, args)
 
             result = self.call(*args, **kwds)
             runtime = time.time() - start