summaryrefslogtreecommitdiff
path: root/Pb_Api/Param
diff options
context:
space:
mode:
authorPepper <pepper@scannerjammer.com>2015-03-04 22:24:31 -0500
committerPepper <pepper@scannerjammer.com>2015-03-04 22:24:31 -0500
commitf9245931af0b8513f3b38e42a89e89ecb96593c6 (patch)
tree1c2c44bbd13bd08765ffd35d1c5b2648db218783 /Pb_Api/Param
parent021842ec42b991e7a641ae26862d77b324ea05db (diff)
still working on it
Diffstat (limited to 'Pb_Api/Param')
-rw-r--r--Pb_Api/Param/Image_Url.py2
-rw-r--r--Pb_Api/Param/MultiSelect.py6
-rw-r--r--Pb_Api/Param/String.py1
-rw-r--r--Pb_Api/Param/Username.py2
-rw-r--r--Pb_Api/Param/__init__.py6
5 files changed, 10 insertions, 7 deletions
diff --git a/Pb_Api/Param/Image_Url.py b/Pb_Api/Param/Image_Url.py
index d199e11..59e7cbc 100644
--- a/Pb_Api/Param/Image_Url.py
+++ b/Pb_Api/Param/Image_Url.py
@@ -2,6 +2,6 @@ from config import TEST_URL
from Pb_Api.Param.String import Pb_Api_Param_String
class Pb_Api_Param_Image_Url(Pb_Api_Param_String):
- def __init__(self, options):
+ def __init__(self, *args, **kwargs):
super(Pb_Api_Param_Image_Url, self).__init__(*args, **kwargs)
self.value(TEST_URL, autogenerated=1)
diff --git a/Pb_Api/Param/MultiSelect.py b/Pb_Api/Param/MultiSelect.py
index c482dfd..da42802 100644
--- a/Pb_Api/Param/MultiSelect.py
+++ b/Pb_Api/Param/MultiSelect.py
@@ -1,14 +1,14 @@
from Pb_Api.Param import Pb_Api_Param
class Pb_Api_Param_MultiSelect(Pb_Api_Param):
- def __init__(self, options):
+ def __init__(self, *args, **kwargs):
super(Pb_Api_Param_MultiSelect, self).__init__(*args, **kwargs)
def options(self):
- return self.options
+ return self._options
def value(self, *args):
if len(args) > 1:
valid = False
- for i in self.options:
+ for i in self.options():
if args[0] == i['value']: valid = True
if not valid : raise ValueError
super(Pb_Api_Param_MultiSelect, self).value(args[0])
diff --git a/Pb_Api/Param/String.py b/Pb_Api/Param/String.py
index f7d873c..a1161a8 100644
--- a/Pb_Api/Param/String.py
+++ b/Pb_Api/Param/String.py
@@ -1,3 +1,4 @@
+from Pb_Api.Param import Pb_Api_Param
class Pb_Api_Param_String(Pb_Api_Param):
def __init__(self, *args, **kwargs):
super(Pb_Api_Param_String, self).__init__(*args, **kwargs)
diff --git a/Pb_Api/Param/Username.py b/Pb_Api/Param/Username.py
index 80b445c..18d7041 100644
--- a/Pb_Api/Param/Username.py
+++ b/Pb_Api/Param/Username.py
@@ -2,6 +2,6 @@ from config import USERNAME
from Pb_Api.Param.String import Pb_Api_Param_String
class Pb_Api_Param_Username(Pb_Api_Param_String):
- def __init__(self, options):
+ def __init__(self, *args, **kwargs):
super(Pb_Api_Param_Username, self).__init__(*args, **kwargs)
self.value(USERNAME, autogenerated=1)
diff --git a/Pb_Api/Param/__init__.py b/Pb_Api/Param/__init__.py
index af13a2a..edbfd53 100644
--- a/Pb_Api/Param/__init__.py
+++ b/Pb_Api/Param/__init__.py
@@ -1,8 +1,10 @@
class Pb_Api_Param(object):
+ def __init__(self, *args, **kwargs):
+ self.value(args, kwargs)
def name(self):
- return self.name
+ return self._name
def required(self):
- return self.required
+ return self._required
def manually_set(self, *args):
if len(args) >= 1: