python: raise a more specific error in Messages.print_messages

Raising Exception is considered bad since the only way to catch
it is to do 'except Exception'. Raising a TypeError is more
appropriate.

Since the format parameter has already been validated, checking
it again is not necessary. Simplify this conditional.

Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>
This commit is contained in:
Justus Winter 2011-09-26 03:05:37 +02:00 committed by Sebastian Spaeth
parent f88d985e50
commit 34990908e7

View file

@ -187,7 +187,7 @@ class Messages(object):
set_end = "]"
set_sep = ", "
else:
raise Exception
raise TypeError("format must be either 'text' or 'json'")
first_set = True
@ -208,10 +208,8 @@ class Messages(object):
if (match or entire_thread):
if format.lower() == "text":
sys.stdout.write(msg.format_message_as_text(indent))
elif format.lower() == "json":
sys.stdout.write(msg.format_message_as_json(indent))
else:
raise NotmuchError
sys.stdout.write(msg.format_message_as_json(indent))
next_indent = indent + 1
# get replies and print them also out (if there are any)