summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--photoblaster/param/img_url.py9
-rw-r--r--photoblaster/server.py7
2 files changed, 9 insertions, 7 deletions
diff --git a/photoblaster/param/img_url.py b/photoblaster/param/img_url.py
index 4a5fef8..b3ca08c 100644
--- a/photoblaster/param/img_url.py
+++ b/photoblaster/param/img_url.py
@@ -64,11 +64,8 @@ class Img_url(Param):
max_size = MAX_SIZE
if self.username in SPECIAL_DOWNLOADERS:
max_size = SPECIAL_DOWNLOADERS_MAX_SIZE
- try:
- self._download(
- url, self.get_file().get_filepath(), max_size=max_size)
- except Exception:
- self.err_warn("Download failed")
+ self._download(
+ url, self.get_file().get_filepath(), max_size=max_size)
def _browser_request(self, url, data=None):
"""sends a get request to the url using browser User-Agent headers"""
@@ -97,7 +94,7 @@ class Img_url(Param):
raise FileTooBigError(
"file too big: max size {} KB / {} is {} KB".format(
str(MAX_SIZE/1024),
- destination,
+ url,
str(len(rawimg)/1024)
)
)
diff --git a/photoblaster/server.py b/photoblaster/server.py
index e7ebcee..3138a94 100644
--- a/photoblaster/server.py
+++ b/photoblaster/server.py
@@ -64,9 +64,14 @@ class InvalidUsage(Exception):
"""error class for InvalidUsage"""
status_code = 400
- def __init__(self, message, status_code=None, payload=None):
+ def __init__(
+ self,
+ message,
+ status_code=None,
+ payload=None):
Exception.__init__(self)
self.message = message
+ sys.stderr.write("Invalid Usage: %s\n" % message)
if status_code is not None:
self.status_code = status_code
self.payload = payload