X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FParameter.py;h=6268fcecd06d41ab6cdae7ba183b714689cc7409;hb=bd0cbf4f7f2e4cf7ceda500bfa6f98c0a700018b;hp=fc25b93a129534d9bfc9bc5cf7492edc23de7b2e;hpb=a74854dd38cb742b8fdc0d0cda7fff738a95312c;p=plcapi.git

diff --git a/PLC/Parameter.py b/PLC/Parameter.py
index fc25b93..6268fce 100644
--- a/PLC/Parameter.py
+++ b/PLC/Parameter.py
@@ -4,8 +4,6 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
-#
 
 from types import *
 from PLC.Faults import *
@@ -17,14 +15,14 @@ class Parameter:
     sub-parameters (i.e., dict fields).
     """
 
-    def __init__(self, type, doc = "",
+    def __init__(self, typeval, doc = "",
                  min = None, max = None,
                  optional = None,
                  ro = False,
                  nullok = False):
         # Basic type of the parameter. Must be a builtin type
         # that can be marshalled by XML-RPC.
-        self.type = type
+        self.type = typeval
 
         # Documentation string for the parameter
         self.doc = doc
@@ -60,7 +58,6 @@ class Mixed(tuple):
     def __new__(cls, *types):
         return tuple.__new__(cls, types)
 
-
 def python_type(arg):
     """
     Returns the Python type of the specified argument, which may be a