ok some more renames

11 files changed, 36 insertions, 36 deletions

diff --git a/lib/param/__init__.py b/lib/param/__init__.py
index bdf5885..2c05726 100644
--- a/lib/param/__init__.py
+++ b/lib/param/__init__.py
@@ -54,12 +54,12 @@ class Param(object):
       if error:
         sys.stderr.write("PARAM ERROR: {}\n".format(str(error)))
 
-from param.int_ import ParamInt
-from param.raw import ParamRaw
-from param.bool_ import ParamBool
-from param.enum import ParamEnum
-from param.json import ParamJson
-from param.color import ParamColor
-from param.float_ import ParamFloat
-from param.img_url import ParamImg_url
-from param.string import ParamString
+from param.int_ import Int
+from param.raw import Raw
+from param.bool_ import Bool
+from param.enum import Enum
+from param.json import Json
+from param.color import Color
+from param.float_ import Float
+from param.img_url import Img_url
+from param.string import String
diff --git a/lib/param/bool_.py b/lib/param/bool_.py
index e275115..acce969 100644
--- a/lib/param/bool_.py
+++ b/lib/param/bool_.py
@@ -1,9 +1,9 @@
 from param import Param
 import re
 import sys
-class ParamBool(Param):
+class Bool(Param):
   def __init__(self, value, classname=""):
-    super(ParamBool, self).__init__(classname=classname)
+    super(Bool, self).__init__(classname=classname)
     if value:
       self.value = self._bool_correct(value)
     else:
diff --git a/lib/param/color.py b/lib/param/color.py
index 5293642..a339b7f 100644
--- a/lib/param/color.py
+++ b/lib/param/color.py
@@ -1,8 +1,8 @@
 from param import Param
 import re
-class ParamColor(Param):
+class Color(Param):
   def __init__(self, value, classname=""):
-    super(ParamColor, self).__init__(classname=classname)
+    super(Color, self).__init__(classname=classname)
     try:
       self.value = self._color_sanitize(value)
     except Exception as e:
diff --git a/lib/param/enum.py b/lib/param/enum.py
index 1dd510a..067e0cd 100644
--- a/lib/param/enum.py
+++ b/lib/param/enum.py
@@ -1,8 +1,8 @@
 from param import Param
 import sys
-class ParamEnum(Param):
+class Enum(Param):
   def __init__(self, value, enum_values=[], classname=""):
-    super(ParamEnum,self).__init__(classname=classname)
+    super(Enum,self).__init__(classname=classname)
     if value not in enum_values:
       return self.err_warn("Value %s not in enum values" % str(value))
     self.value = value
diff --git a/lib/param/float_.py b/lib/param/float_.py
index a67bd44..f5d1816 100644
--- a/lib/param/float_.py
+++ b/lib/param/float_.py
@@ -1,9 +1,9 @@
 from param import Param
 
-class ParamFloat(Param):
+class Float(Param):
   def __init__(self, value, classname=""):
     self._classname = classname
-    super(ParamFloat, self).__init__(classname=classname)
+    super(Float, self).__init__(classname=classname)
     try: 
       if value:
         self.value = float(value)
diff --git a/lib/param/img_url.py b/lib/param/img_url.py
index a73fdd0..4ce7ce7 100644
--- a/lib/param/img_url.py
+++ b/lib/param/img_url.py
@@ -12,9 +12,9 @@ urlencode = urllib.urlencode
 urlopen = urllib2.urlopen
 
 import sys;
-class ParamImg_url(Param):
+class Img_url(Param):
   def __init__(self, value, key="", classname=""):
-    super(ParamImg_url, self).__init__(classname=classname)
+    super(Img_url, self).__init__(classname=classname)
     if value:
       try:
         self.filename = self._filename_temporary(key)
diff --git a/lib/param/int_.py b/lib/param/int_.py
index fd9730d..b33c6b5 100644
--- a/lib/param/int_.py
+++ b/lib/param/int_.py
@@ -1,8 +1,8 @@
 from param import Param
 
-class ParamInt(Param):
+class Int(Param):
   def __init__(self, value, classname=""):
-    super(ParamInt, self).__init__(classname=classname)
+    super(Int, self).__init__(classname=classname)
     try: 
       if value:
         self.value = int(value)
diff --git a/lib/param/json.py b/lib/param/json.py
index 8897710..8d1a66e 100644
--- a/lib/param/json.py
+++ b/lib/param/json.py
@@ -1,8 +1,8 @@
 from param import Param
 import simplejson as json
 
-class ParamJson(Param):
+class Json(Param):
   def __init__(self, value, classname=""):
-    super(ParamJson, self).__init__(classname=classname)
+    super(Json, self).__init__(classname=classname)
     self.value = json.parse(value)
 
diff --git a/lib/param/raw.py b/lib/param/raw.py
index f9cdea9..839f7e5 100644
--- a/lib/param/raw.py
+++ b/lib/param/raw.py
@@ -1,6 +1,6 @@
 from param import Param
 
-class ParamRaw(Param):
+class Raw(Param):
   def __init__(self, value, classname=""):
-    super(ParamRaw, self).__init__(classname=classname)
+    super(Raw, self).__init__(classname=classname)
     self.value = value
diff --git a/lib/param/string.py b/lib/param/string.py
index 91a2d34..bd3d6d8 100644
--- a/lib/param/string.py
+++ b/lib/param/string.py
@@ -1,9 +1,9 @@
 from param import Param
 import re
 import sys
-class ParamString(Param):
+class String(Param):
   def __init__(self, value, classname=""):
-    super(ParamString, self).__init__(classname=classname)
+    super(String, self).__init__(classname=classname)
     if value:
       try:
         self.value = self.sanitize(value)
diff --git a/lib/params.py b/lib/params.py
index 409dee8..6db17d2 100644
--- a/lib/params.py
+++ b/lib/params.py
@@ -42,23 +42,23 @@ class Params(object):
           elif 'default' in def_dict[key]:
             value = def_dict[key]['default']
           if def_dict[key]['type'] == "bool":
-            instance = ParamBool(value, classname=classname)
+            instance = Bool(value, classname=classname)
           elif def_dict[key]['type'] == "color":
-            instance = ParamColor(value, classname=classname)
+            instance = Color(value, classname=classname)
           elif def_dict[key]['type'] == "enum":
-            instance = ParamEnum(value, enum_values=def_dict[key]['enum_values'], classname=classname)
+            instance = Enum(value, enum_values=def_dict[key]['enum_values'], classname=classname)
           elif def_dict[key]['type'] == "float":
-            instance = ParamFloat(value, classname=classname)
+            instance = Float(value, classname=classname)
           elif def_dict[key]['type'] == "img_url":
-            instance = ParamImg_url(value, key=key, classname=classname)
+            instance = Img_url(value, key=key, classname=classname)
           elif def_dict[key]['type'] == "int":
-            instance = ParamInt(value, classname=classname)
+            instance = Int(value, classname=classname)
           elif def_dict[key]['type'] == "json":
-            instance = ParamJson(value, classname=classname)
+            instance = Json(value, classname=classname)
           elif def_dict[key]['type'] == "raw":
-            instance = ParamRaw(value, classname=classname)
+            instance = Raw(value, classname=classname)
           elif def_dict[key]['type'] == "string":
-            instance = ParamString(value, classname=classname)
+            instance = String(value, classname=classname)
           self.__setattr__(key, instance) 
         except Exception as e:
           self.err_warn("key: %s value: %s" % (key, str(def_dict[key])), error=str(e))