From 480896bd416d0dfef7716508c6a10144d0fa068e Mon Sep 17 00:00:00 2001 From: Pepper Date: Sun, 27 Sep 2015 03:02:22 -0400 Subject: ready for merge and ready for publish --- lib/param/img_url.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'lib/param/img_url.py') 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") -- cgit v1.2.3-70-g09d2