From e89730dc8ffa24607c63a91c91ddf706bf526f72 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Tue, 31 May 2016 19:46:42 -0700 Subject: [PATCH] subject_links: Remove useless RealmFilter.DoesNotExist case. --- zerver/lib/bugdown/__init__.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/zerver/lib/bugdown/__init__.py b/zerver/lib/bugdown/__init__.py index 535bd43681..45277760ea 100644 --- a/zerver/lib/bugdown/__init__.py +++ b/zerver/lib/bugdown/__init__.py @@ -1025,16 +1025,13 @@ def subject_links(domain, subject): from zerver.models import get_realm, RealmFilter, realm_filters_for_domain matches = [] # type: List[text_type] - try: - realm_filters = realm_filters_for_domain(domain) + realm_filters = realm_filters_for_domain(domain) - for realm_filter in realm_filters: - pattern = prepare_realm_pattern(realm_filter[0]) - for m in re.finditer(pattern, subject): - matches += [realm_filter[1] % m.groupdict()] - return matches - except RealmFilter.DoesNotExist: - return matches + for realm_filter in realm_filters: + pattern = prepare_realm_pattern(realm_filter[0]) + for m in re.finditer(pattern, subject): + matches += [realm_filter[1] % m.groupdict()] + return matches def make_realm_filters(domain, filters): global md_engines, realm_filter_data