Prettier exception handling

This commit is contained in:
Klaus-Uwe Mitterer 2016-03-27 19:14:01 +02:00
parent f26e995f58
commit 8517d62b45

View file

@ -40,14 +40,14 @@ def urlparse(url):
if "/auswertung/pix/popup.php/" in url:
return "http://www.planetromeo.com/img/usr/%s" % url[52:82]
else:
raise ValueError("%s is not a valid URL.")
raise ValueError("%s is not a valid URL" % url)
def processURL(url, sender = False, geturls = False, verbose = False, shutup = False):
verboselog("Processing URL %s..." % url, verbose)
try:
purl = urlparse(url)
except ValueError:
log("Notice: %s is not a valid URL. Skipping." % url, shutup)
except ValueError as e:
log("Notice: %s. Skipping." % e, shutup)
else:
if purl == urlparse(url):
log("Warning: You may have copied the image URL rather than the link URL from the message window. Use the link URL instead!", shutup)