PEP8 cleanup of the entire codebase. Unchanged are many cases of too-long lines, partly because of the rewrite they would require but also because splitting many lines up would make the code harder to read. Also the third-party libraries (idmapper, prettytable etc) were not cleaned.

src/help/__init__.py

@@ -1,11 +1,11 @@
 """
-Makes it easier to import by grouping all relevant things already at this level. 
+Makes it easier to import by grouping all relevant things already at this level.
 
 You can henceforth import most things directly from src.help
 Also, the initiated object manager is available as src.help.manager.
 
 """
 
-from src.help.models import * 
+from src.help.models import *
 
 manager = HelpEntry.objects

src/help/admin.py

@@ -1,36 +1,37 @@
-"""
-This defines how to edit help entries in Admin.
-"""
-from django import forms
-from django.contrib import admin
-from src.help.models import HelpEntry
-
-
-
-class HelpEntryForm(forms.ModelForm):
-    "Defines how to display the help entry"
-    class Meta:
-        model = HelpEntry
-    db_help_category = forms.CharField(label="Help category", initial='General',
-                                       help_text="organizes help entries in lists")
-    db_lock_storage = forms.CharField(label="Locks", initial='view:all()',required=False,
-                                      widget=forms.TextInput(attrs={'size':'40'}),)
-
-class HelpEntryAdmin(admin.ModelAdmin):
-    "Sets up the admin manaager for help entries"
-
-    list_display = ('id', 'db_key', 'db_help_category', 'db_lock_storage')
-    list_display_links = ('id', 'db_key')
-    search_fields = ['^db_key', 'db_entrytext']
-    ordering = ['db_help_category', 'db_key']
-    save_as = True
-    save_on_top = True
-    list_select_related = True
-
-    form = HelpEntryForm
-    fieldsets = (
-        (None, {'fields':(('db_key', 'db_help_category'), 'db_entrytext', 'db_lock_storage'),
-                'description':"Sets a Help entry. Set lock to <i>view:all()</I> unless you want to restrict it."}),)
-
-
-admin.site.register(HelpEntry, HelpEntryAdmin)
+"""
+This defines how to edit help entries in Admin.
+"""
+from django import forms
+from django.contrib import admin
+from src.help.models import HelpEntry
+
+
+
+class HelpEntryForm(forms.ModelForm):
+    "Defines how to display the help entry"
+    class Meta:
+        model = HelpEntry
+    db_help_category = forms.CharField(label="Help category", initial='General',
+                                       help_text="organizes help entries in lists")
+    db_lock_storage = forms.CharField(label="Locks", initial='view:all()',required=False,
+                                      widget=forms.TextInput(attrs={'size':'40'}),)
+
+class HelpEntryAdmin(admin.ModelAdmin):
+    "Sets up the admin manaager for help entries"
+
+    list_display = ('id', 'db_key', 'db_help_category', 'db_lock_storage')
+    list_display_links = ('id', 'db_key')
+    search_fields = ['^db_key', 'db_entrytext']
+    ordering = ['db_help_category', 'db_key']
+    save_as = True
+    save_on_top = True
+    list_select_related = True
+
+    form = HelpEntryForm
+    fieldsets = (
+        (None, {'fields':(('db_key', 'db_help_category'),
+                           'db_entrytext', 'db_lock_storage'),
+                'description':"Sets a Help entry. Set lock to <i>view:all()</I> unless you want to restrict it."}),)
+
+
+admin.site.register(HelpEntry, HelpEntryAdmin)

src/help/manager.py

@@ -5,6 +5,7 @@ from django.db import models
 from src.utils import logger, utils
 __all__ = ("HelpEntryManager",)
 
+
 class HelpEntryManager(models.Manager):
     """
     This HelpEntryManager implements methods for searching
@@ -48,7 +49,7 @@ class HelpEntryManager(models.Manager):
         Do a fuzzy match, preferably within the category of the
         current topic.
         """
-        return self.filter(db_key__icontains=topicstring).exclude(db_key__iexact=topicstring)
+        return self.filter(db_key__icontains=topicstr).exclude(db_key__iexact=topicstr)
 
     def find_topics_with_category(self, help_category):
         """
@@ -92,6 +93,7 @@ class HelpEntryManager(models.Manager):
         """
         ostring = ostring.strip().lower()
         if help_category:
-            return self.filter(db_key__iexact=ostring, db_help_category__iexact=help_category)
+            return self.filter(db_key__iexact=ostring,
+                               db_help_category__iexact=help_category)
         else:
             return self.filter(db_key__iexact=ostring)

src/help/models.py

@@ -12,12 +12,11 @@ game world, policy info, rules and similar.
 from django.db import models
 from src.utils.idmapper.models import SharedMemoryModel
 from src.help.manager import HelpEntryManager
-from src.utils import ansi
 from src.typeclasses.models import Tag, TagHandler
 from src.locks.lockhandler import LockHandler
-from src.utils.utils import is_iter
 __all__ = ("HelpEntry",)
 
+
 #------------------------------------------------------------
 #
 # HelpEntry