replace single character variables with .. slightly better/longer ones. Rationale: typically in pdb, I just type a variable to see the unicode or repr of it. Attempting to do so with the characters [n|c|w|d|u|s|r|j|l|a|q] would result in PDB doing something, rather than showin the variable itself.

Author: kezabelle

cms/admin/pageadmin.py

@@ -313,10 +313,9 @@ def get_fieldsets(self, request, obj=None):
         if obj: # edit
             given_fieldsets = deepcopy(self.fieldsets)
             if not obj.has_publish_permission(request):
-                l = list(given_fieldsets[0][1]['fields'][2])
-                l.remove('published')
-                given_fieldsets[0][1]['fields'][2] = tuple(l)
-            placeholders_template = get_template_from_request(request, obj)
+                fields = list(given_fieldsets[0][1]['fields'][2])
+                fields.remove('published')
+                given_fieldsets[0][1]['fields'][2] = tuple(fields)
             for placeholder_name in self.get_fieldset_placeholders(placeholders_template):
                 name = placeholder_utils.get_placeholder_conf("name", placeholder_name, obj.template, placeholder_name)
                 name = _(name)

cms/models/managers.py

@@ -114,11 +114,11 @@ def search(self, q, language=None, current_site_only=True):
         qp = Q()
         plugins = plugin_pool.get_all_plugins()
         for plugin in plugins:
-            c = plugin.model
-            if hasattr(c, 'search_fields'):
-                for field in c.search_fields:
+            cmsplugin = plugin.model
+            if hasattr(cmsplugin, 'search_fields'):
+                for field in cmsplugin.search_fields:
                     qp |= Q(**{'placeholders__cmsplugin__%s__%s__icontains' % \
-                                   (c.__name__.lower(), field): q})
+                                   (cmsplugin.__name__.lower(), field):q})
         if language:
             qt &= Q(title_set__language=language)
             qp &= Q(cmsplugin__language=language)
@@ -142,9 +142,9 @@ def get_title(self, page, language, language_fallback=False):
                 try:
                     titles = self.filter(page=page)
                     fallbacks = get_fallback_languages(language)
-                    for l in fallbacks:
+                    for lang in fallbacks:
                         for title in titles:
-                            if l == title.language:
+                            if lang == title.language:
                                 return title
                     return None
                 except self.model.DoesNotExist:
@@ -355,8 +355,8 @@ def for_page(self, page):
         q_parents = Q(**left_right)
         q_desc = (Q(page__level__lt=page.level) & (Q(grant_on=ACCESS_DESCENDANTS) | Q(grant_on=ACCESS_PAGE_AND_DESCENDANTS)))
         q_kids = (Q(page__level=page.level - 1) & (Q(grant_on=ACCESS_CHILDREN) | Q(grant_on=ACCESS_PAGE_AND_CHILDREN)))
-        q = q_tree & q_parents & (q_page | q_desc | q_kids)
-        return self.filter(q).order_by('page__level')
+        query = q_tree & q_parents & (q_page | q_desc | q_kids)
+        return self.filter(query).order_by('page__level')
 
 
 class PagePermissionsPermissionManager(models.Manager):

cms/models/pagemodel.py

@@ -844,12 +844,11 @@ def get_moderator_queryset(self):
         from cms.models.moderatormodels import PageModerator
         if not settings.CMS_MODERATOR or not self.tree_id:
             return PageModerator.objects.get_empty_query_set()
-
-        q = Q(page__tree_id=self.tree_id, page__level__lt=self.level, moderate_descendants=True) | \
+        query = Q(page__tree_id=self.tree_id, page__level__lt=self.level, moderate_descendants=True) | \
             Q(page__tree_id=self.tree_id, page__level=self.level - 1, moderate_children=True) | \
             Q(page__pk=self.pk, moderate_page=True)
 
-        return PageModerator.objects.distinct().filter(q).order_by('page__level')
+        return PageModerator.objects.distinct().filter(query).order_by('page__level')
 
     def is_under_moderation(self):
         return bool(self.get_moderator_queryset().count())

cms/plugin_rendering.py

@@ -71,15 +71,15 @@ def render_plugins(plugins, context, placeholder, processors=None):
     This is the main plugin rendering utility function, use this function rather than
     Plugin.render_plugin().
     """
-    c = []
+    out = []
     total = len(plugins)
     for index, plugin in enumerate(plugins):
         plugin._render_meta.total = total 
         plugin._render_meta.index = index
         context.push()
-        c.append(plugin.render_plugin(context, placeholder, processors=processors))
+        out.append(plugin.render_plugin(context, placeholder, processors=processors))
         context.pop()
-    return c
+    return out
 
 def render_placeholder(placeholder, context_to_copy, name_fallback="Placeholder"):
     """
@@ -108,7 +108,7 @@ def render_placeholder(placeholder, context_to_copy, name_fallback="Placeholder"
         if not key in context:
             context[key] = value
 
-    c = []
+    content = []
 
     # Prepend frontedit toolbar output if applicable
     edit = False
@@ -123,8 +123,8 @@ def render_placeholder(placeholder, context_to_copy, name_fallback="Placeholder"
     else:
         processors = None 
 
-    c.extend(render_plugins(plugins, context, placeholder, processors))
-    content = "".join(c)
+    content.extend(render_plugins(plugins, context, placeholder, processors))
+    content = "".join(content)
     if edit:
         content = render_placeholder_toolbar(placeholder, context, content, name_fallback)
     context.pop()

cms/templatetags/cms_tags.py

@@ -370,7 +370,6 @@ def _show_placeholder_for_page(context, placeholder_name, page_lookup, lang=None
                 raise
             return {'content': ''}
         content = render_placeholder(placeholder, context, placeholder_name)
-
     if cache_result:
         cache.set(cache_key, content, settings.CMS_CACHE_DURATIONS['content'])
 

cms/utils/page_resolver.py

@@ -62,11 +62,11 @@ def get_page_from_path(path, preview=False):
     # title_set__path=path should be clear, get the pages where the path of the
     # title object is equal to our path.
     if settings.CMS_FLAT_URLS:
-        q = Q(title_set__slug=path)
+        query = Q(title_set__slug=path)
     else:
-        q = Q(title_set__path=path)
+        query = Q(title_set__path=path)
     try:
-        page = pages.filter(q).distinct().get()
+        page = pages.filter(query).distinct().get()
     except Page.DoesNotExist:
         return None
 

cms/utils/permissions.py

@@ -273,19 +273,18 @@ def get_user_sites_queryset(user):
         Q(can_add=True) | Q(can_change=True)
     ).values_list('id', flat=True)
 
-    q = Q()
+    query = Q()
     if global_ids:
-        q = Q(globalpagepermission__id__in=global_ids)
+        query = Q(globalpagepermission__id__in=global_ids)
         # haves some global permissions assigned
-        if not qs.filter(q).exists():
+        if not qs.filter(query).exists():
             # haves global permissions, but none of sites is specified,
             # so he haves access to all sites
             return qs
-    
     # add some pages if he has permission to add / change them
-    q |= Q(Q(page__pagepermission__user=user) | Q(page__pagepermission__group__user=user)) & \
+    query |= Q(Q(page__pagepermission__user=user) | Q(page__pagepermission__group__user=user)) & \
         (Q(Q(page__pagepermission__can_add=True) | Q(page__pagepermission__can_change=True)))
-    return qs.filter(q).distinct()
+    return qs.filter(query).distinct()
 
 
 def has_plugin_permission(user, plugin_type, permission_type):

cms/utils/placeholder.py

@@ -76,9 +76,9 @@ def copy(self, target_placeholder, source_language, fieldname, model, target_lan
     def get_copy_languages(self, placeholder, model, fieldname, **kwargs):
         manager = model.objects
         src = manager.get(**{fieldname: placeholder})
-        q = Q(master=src.master)
-        q &= Q(**{'%s__cmsplugin__isnull' % fieldname: False})
-        q &= ~Q(pk=src.pk)
+        query = Q(master=src.master)
+        query &= Q(**{'%s__cmsplugin__isnull' % fieldname: False})
+        query &= ~Q(pk=src.pk)
 
-        language_codes = manager.filter(q).values_list('language_code', flat=True).distinct()
+        language_codes = manager.filter(query).values_list('language_code', flat=True).distinct()
         return [(lc, dict(settings.LANGUAGES)[lc]) for lc in language_codes]

menus/modifiers.py

@@ -26,17 +26,17 @@ def modify(self, request, nodes, namespace, root_id, post_cut, breadcrumb):
                 root_nodes.append(node)
             if node.selected: 
                 if node.parent:
-                    n = node
-                    while n.parent:
-                        n = n.parent
-                        n.ancestor = True
+                    newnode = node
+                    while newnode.parent:
+                        newnode = newnode.parent
+                        newnode.ancestor = True
                     for sibling in node.parent.children:
                         if not sibling.selected:
                             sibling.sibling = True
                 else:
-                    for n in root_nodes:
-                        if not n.selected:
-                            n.sibling = True
+                    for root_node in root_nodes:
+                        if not root_node.selected:
+                            root_node.sibling = True
                 if node.children:                    
                     self.mark_descendants(node.children)
                 selected = node

menus/templatetags/menu_tags.py

@@ -248,11 +248,11 @@ def get_context(self, context, start_level, template, only_visible):
             if node.get_absolute_url() == urllib.unquote(reverse("pages-root")):
                 home = node
         if selected and selected != home:
-            n = selected
-            while n:
-                if n.visible or not only_visible:
-                    ancestors.append(n)
-                n = n.parent
+            node = selected
+            while node:
+                if node.visible or not only_visible:
+                    ancestors.append(node)
+                node = node.parent
         if not ancestors or (ancestors and ancestors[-1] != home) and home:
             ancestors.append(home)
         ancestors.reverse()