diff options
Diffstat (limited to 'Pb/Pattern/__init__.py')
| -rwxr-xr-x | Pb/Pattern/__init__.py | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/Pb/Pattern/__init__.py b/Pb/Pattern/__init__.py index 3a094dd..4e4c5a8 100755 --- a/Pb/Pattern/__init__.py +++ b/Pb/Pattern/__init__.py @@ -19,19 +19,15 @@ class PbPattern(Pb): # "username" : "garfield", "image_url" : "http://i.asdf.us/im/be/PinkHijab_1425078647_reye.gif", } - def __init__(self, - pattern_url=None, - pattern_data=None, - username=None, - image_url=None, - ): + def __init__(self, **kwargs): super(PbPattern,self).__init__(); - - self.params.set_val("image_url", image_url, value_type="img_url"); - self.params.set_val("pattern_url", pattern_url, value_type="img_url"); - self.params.set_val("pattern_data", pattern_data, value_type="json"); - self.params.set_val("username", username, value_type="string"); - + _definitions = { + 'image_url': { 'type':'img_url' }, + 'pattern_url': { 'type':'img_url' }, + 'pattern_data': { 'type':'raw' }, + 'username': { 'type':'string' }, + } + self.params.definitions_import(_definitions, kwargs, classname=self.__class__.__name__); self.filename, self.filepath = self._filename_filepath_create(url=self.params.image_url['url'], extension=self.params.image_url['mimetype']) _pattern_filename, self._pattern_filepath = self._filename_filepath_create(namepart="pattern") @@ -45,7 +41,7 @@ class PbPattern(Pb): return (0,0,0,255); else: return (255,255,255,255) - specs = json.loads(self.params.pattern_data); + specs = json.loads(str(self.params.pattern_data)); if int(specs['width']) > 100 or int(specs['height']) > 100: raise ValueError sys.stderr.write("height and width need to be less than 100 px") |
