diff options
Diffstat (limited to 'lib/param')
| -rw-r--r-- | lib/param/__init__.py | 2 | ||||
| -rw-r--r-- | lib/param/img_url.py | 19 | ||||
| -rw-r--r-- | lib/param/param.py | 10 |
3 files changed, 12 insertions, 19 deletions
diff --git a/lib/param/__init__.py b/lib/param/__init__.py index 4f3daba..c7ea845 100644 --- a/lib/param/__init__.py +++ b/lib/param/__init__.py @@ -1,5 +1,5 @@ """imports for the param package""" -from .param import Param +from .param import Param, BadParamError from .int_ import Int from .raw import Raw from .bool_ import Bool diff --git a/lib/param/img_url.py b/lib/param/img_url.py index 69e3d66..84d6123 100644 --- a/lib/param/img_url.py +++ b/lib/param/img_url.py @@ -25,16 +25,12 @@ class Img_url(Param): """ super(Img_url, self).__init__(classname=classname) if value: - try: - self.filename = self._filename_temporary(key) + self.filename = self._filename_temporary(key) - self.path = os.path.join(self._working_dir, self.filename) - self._image_download(value, self.path) - self.mimetype = self._image_mimetype(self.path) - self.url = value - except Exception as e: - self.err_warn("Unable to download image: %s" % str(value)) - self.err_warn(str(e)) + self.path = os.path.join(self._working_dir, self.filename) + self._image_download(value, self.path) + self.mimetype = self._image_mimetype(self.path) + self.url = value def _filename_temporary(self, s): return "_tmp-{}-{}_{}".format(self._classname, self._now, s) @@ -78,7 +74,7 @@ class Img_url(Param): response = urllib2.urlopen(req) except IOError as e: if hasattr(e, 'code'): - sys.stderr.write('browser request error: %s - ERROR %s' % (url, e.code)) + self.err_warn('browser request error: %s - ERROR %s' % (url, e.code)) raise IOError return response @@ -107,5 +103,4 @@ class Img_url(Param): ).communicate()[0].split(" ")[1].lower() return mimetype except Exception as e: - sys.stderr.write("couldn't determine mimetype\n") - raise e + self.err_warn("Couldn't determine mimetype") diff --git a/lib/param/param.py b/lib/param/param.py index d1e1446..3268274 100644 --- a/lib/param/param.py +++ b/lib/param/param.py @@ -36,9 +36,9 @@ class Param(object): except Exception as e: self.err_warn("Unable to set value {}".format(value)) - def err_warn(self, s, error=None): - self._error_log(s, error=error) - raise BadParamError("%s - %s" % (self._classname, s)) + def err_warn(self, s): + self._error_log(s) + raise BadParamError("%s - %s\n" % (self._classname, s)) def __getattr__(self, key): try: @@ -50,10 +50,8 @@ class Param(object): self._log(s, error, fatal=True) sys.exit(1) - def _error_log(self, s, error=None, fatal=False): + def _error_log(self, s, fatal=False): message = "ERROR - BAD PARAM" if fatal: message += "- [FATAL] -" sys.stderr.write("{}:{} - {}\n".format(message, self._classname, s)) - if error: - sys.stderr.write("PARAM ERROR: {}\n".format(str(error))) |