From 8f2230b7c866320e3839d6812b98b8370a7ec5d9 Mon Sep 17 00:00:00 2001 From: yo mama Date: Sat, 19 Sep 2015 16:13:31 -0700 Subject: ok all modules working --- Pb/Landscape/__init__.py | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'Pb/Landscape/__init__.py') diff --git a/Pb/Landscape/__init__.py b/Pb/Landscape/__init__.py index 4df06fd..33eedd6 100755 --- a/Pb/Landscape/__init__.py +++ b/Pb/Landscape/__init__.py @@ -2,7 +2,7 @@ from Config import * import Pb import base64 from Pb import Pb -import urlparse +import urlparse, re class PbLandscape(Pb): example_params = { @@ -11,22 +11,21 @@ class PbLandscape(Pb): 'heightmap' : 'http://someurl.biz/someimg.jpg', 'name' : 'donkey' } - def __init__(self, - heightmap=None, - imgdata=None, - texture=None, - name="", - ): + def __init__(self, **kwargs): super(PbLandscape,self).__init__(); - self.params.set_val("heightmap", heightmap, value_type="string"); - self.params.set_val("imgdata", imgdata, value_type="raw"); - self.params.set_val("texture", texture, value_type="string"); - self.params.set_val("username", name, value_type="string"); - self.filename, self.filepath = self._filename_filepath_create(url=self.params.texture, extension="png") + _definitions = { + 'heightmap': {'type': 'string'} , + 'imgdata': {'type': 'raw' } , + 'texture': {'type': 'string' } , + 'username': {'type': 'string'} , + } + self.params.definitions_import(_definitions, kwargs, classname=self.__class__.__name__); + _namepart = re.sub(r'https?:?/?/?', '', str(self.params.texture)) + self.filename, self.filepath = self._filename_filepath_create(url=_namepart, extension="png") def _saveImgData(self): try: - up = urlparse.urlparse(self.params.imgdata) + up = urlparse.urlparse(str(self.params.imgdata)) head, data = up.path.split(',', 1) bits = head.split(';') mime_type = bits[0] if bits[0] else 'text/plain' -- cgit v1.2.3-70-g09d2