From 5d7fcb67dd1926b650ea4215813b1e7c74679b70 Mon Sep 17 00:00:00 2001 From: Greg Taylor Date: Sun, 18 Jan 2009 04:58:10 +0000 Subject: [PATCH] I'm not too sure what I was doing with awfully implemented exception handling in helpsys models.py. Yank that nasty stuff. --- src/helpsys/models.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/helpsys/models.py b/src/helpsys/models.py index 4845a273d6..b5f42ae7f7 100644 --- a/src/helpsys/models.py +++ b/src/helpsys/models.py @@ -27,19 +27,13 @@ class HelpEntry(models.Model): """ Returns the topic's name. """ - try: - return self.topicname - except: - return None + return self.topicname def get_entrytext_ingame(self): """ Gets the entry text for in-game viewing. """ - try: - return ansi.parse_ansi(self.entrytext) - except: - return None + return ansi.parse_ansi(self.entrytext) class HelpEntryAdmin(admin.ModelAdmin): list_display = ('id', 'topicname', 'staff_only')