I18n string cleanup and refactoring

evennia/help/filehelp.py

@@ -113,6 +113,7 @@ class FileHelpStorageHandler:
 
     Note that this is not meant to any searching/lookup - that is all handled
     by the help command.
+
     """
 
     def __init__(self, help_file_modules=settings.FILE_HELP_ENTRY_MODULES):

evennia/help/manager.py

@@ -1,7 +1,6 @@
 """
 Custom manager for HelpEntry objects.
 """
-from django.db import models
 from evennia.utils import logger, utils
 from evennia.typeclasses.managers import TypedObjectManager
 
@@ -131,7 +130,7 @@ class HelpEntryManager(TypedObjectManager):
         for topic in topics:
             topic.help_category = default_category
             topic.save()
-        string = _("Help database moved to category {default_category}").format(
+        string = "Help database moved to category {default_category}".format(
             default_category=default_category
         )
         logger.log_info(string)

evennia/help/models.py

@@ -168,7 +168,9 @@ class HelpEntry(SharedMemoryModel):
         a named view of 'character-create' would be referenced by this method.
 
         ex.
-        url(r'characters/create/', ChargenView.as_view(), name='character-create')
+        ::
+
+            url(r'characters/create/', ChargenView.as_view(), name='character-create')
 
         If no View has been created and defined in urls.py, returns an
         HTML anchor.
@@ -183,7 +185,7 @@ class HelpEntry(SharedMemoryModel):
         """
         try:
             return reverse("%s-create" % slugify(cls._meta.verbose_name))
-        except:
+        except Exception:
             return "#"
 
     def web_get_detail_url(self):
@@ -198,8 +200,9 @@ class HelpEntry(SharedMemoryModel):
         a named view of 'character-detail' would be referenced by this method.
 
         ex.
-        url(r'characters/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/$',
-            CharDetailView.as_view(), name='character-detail')
+        ::
+            url(r'characters/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/$',
+                CharDetailView.as_view(), name='character-detail')
 
         If no View has been created and defined in urls.py, returns an
         HTML anchor.
@@ -217,8 +220,7 @@ class HelpEntry(SharedMemoryModel):
                 "%s-detail" % slugify(self._meta.verbose_name),
                 kwargs={"category": slugify(self.db_help_category), "topic": slugify(self.db_key)},
             )
-        except Exception as e:
-            print(e)
+        except Exception:
             return "#"
 
     def web_get_update_url(self):
@@ -233,8 +235,10 @@ class HelpEntry(SharedMemoryModel):
         a named view of 'character-update' would be referenced by this method.
 
         ex.
-        url(r'characters/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/change/$',
-            CharUpdateView.as_view(), name='character-update')
+        ::
+
+            url(r'characters/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/change/$',
+                CharUpdateView.as_view(), name='character-update')
 
         If no View has been created and defined in urls.py, returns an
         HTML anchor.
@@ -252,7 +256,7 @@ class HelpEntry(SharedMemoryModel):
                 "%s-update" % slugify(self._meta.verbose_name),
                 kwargs={"category": slugify(self.db_help_category), "topic": slugify(self.db_key)},
             )
-        except:
+        except Exception:
             return "#"
 
     def web_get_delete_url(self):
@@ -266,8 +270,10 @@ class HelpEntry(SharedMemoryModel):
         a named view of 'character-detail' would be referenced by this method.
 
         ex.
-        url(r'characters/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/delete/$',
-            CharDeleteView.as_view(), name='character-delete')
+        ::
+
+            url(r'characters/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/delete/$',
+                CharDeleteView.as_view(), name='character-delete')
 
         If no View has been created and defined in urls.py, returns an
         HTML anchor.
@@ -285,7 +291,7 @@ class HelpEntry(SharedMemoryModel):
                 "%s-delete" % slugify(self._meta.verbose_name),
                 kwargs={"category": slugify(self.db_help_category), "topic": slugify(self.db_key)},
             )
-        except:
+        except Exception:
             return "#"
 
     # Used by Django Sites/Admin

evennia/help/utils.py

@@ -73,7 +73,6 @@ def help_search_with_index(query, candidate_entries, suggestion_maxnum=5, fields
         custom_stop_words_filter = stop_word_filter.generate_stop_word_filter(stop_words)
         _LUNR_BUILDER_PIPELINE = (trimmer, custom_stop_words_filter, stemmer)
 
-
     indx = [cnd.search_index_entry for cnd in candidate_entries]
     mapping = {indx[ix]["key"]: cand for ix, cand in enumerate(candidate_entries)}