Skip to content
This repository has been archived by the owner on Jan 15, 2019. It is now read-only.

Commit

Permalink
pep8 cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
bryanhelmig committed Feb 21, 2012
1 parent 5888ce0 commit 9a47cdc
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 15 deletions.
6 changes: 4 additions & 2 deletions knowledge/admin.py
Expand Up @@ -5,15 +5,17 @@

class CategoryAdmin(admin.ModelAdmin):
list_display = [f.name for f in Category._meta.fields]
prepopulated_fields = {'slug':('title',),}
prepopulated_fields = {'slug': ('title', )}
admin.site.register(Category, CategoryAdmin)


class QuestionAdmin(admin.ModelAdmin):
list_display = [f.name for f in Question._meta.fields]
list_select_related = True
admin.site.register(Question, QuestionAdmin)


class ResponseAdmin(admin.ModelAdmin):
list_display = [f.name for f in Response._meta.fields]
list_select_related = True
admin.site.register(Response, ResponseAdmin)
admin.site.register(Response, ResponseAdmin)
2 changes: 0 additions & 2 deletions knowledge/forms.py
Expand Up @@ -50,7 +50,6 @@ class Meta:

return _QuestionForm(*args, **kwargs)


def ResponseForm(user, question, *args, **kwargs):
"""
Build and return the appropriate form depending
Expand All @@ -77,7 +76,6 @@ def ResponseForm(user, question, *args, **kwargs):
if user.is_staff:
selected_fields += ['status']


class _ResponseForm(forms.ModelForm):
def __init__(self, *args, **kwargs):
super(_ResponseForm, self).__init__(*args, **kwargs)
Expand Down
10 changes: 4 additions & 6 deletions knowledge/models.py
Expand Up @@ -47,7 +47,6 @@ class KnowledgeBase(models.Model):
email = models.EmailField(blank=True, null=True,
help_text='Enter a valid email address.')


#########################
#### GENERIC GETTERS ####
#########################
Expand All @@ -63,7 +62,6 @@ def get_name(self):

get_email = lambda self: self.email or self.user.email


########################
#### STATUS METHODS ####
########################
Expand Down Expand Up @@ -113,7 +111,7 @@ class Meta:

def save(self, *args, **kwargs):
if not self.user and self.name and self.email\
and not self.id:
and not self.id:
# first time because no id
self.public(save=False)

Expand Down Expand Up @@ -176,7 +174,7 @@ def accepted(self):
or not.
"""
return any([r.accepted for r in self.get_responses()])

def clear_accepted(self):
self.get_responses().update(accepted=False)

Expand Down Expand Up @@ -212,7 +210,7 @@ def get_absolute_url(self):
return ('knowledge_thread', [self.id, slugify(self.title)])
else:
return ('knowledge_thread_no_slug', [self.id])

def __unicode__(self):
return self.title

Expand Down Expand Up @@ -244,7 +242,7 @@ def states(self):

def accept(self):
self.question.accept(self)

def __unicode__(self):
return self.body[0:100] + u'...'

Expand Down
4 changes: 2 additions & 2 deletions knowledge/utils.py
@@ -1,7 +1,7 @@
def paginate(iterable, per_page, page_num):
"""
recipes = Recipe.objects.all()
paginator, recipes = paginate(recipes, 12,
paginator, recipes = paginate(recipes, 12,
request.GET.get('page', '1'))
"""
from django.core.paginator import Paginator, InvalidPage, EmptyPage
Expand All @@ -18,4 +18,4 @@ def paginate(iterable, per_page, page_num):
except (EmptyPage, InvalidPage):
iterable = paginator.page(paginator.num_pages)

return paginator, iterable
return paginator, iterable
7 changes: 4 additions & 3 deletions knowledge/views.py
Expand Up @@ -21,6 +21,7 @@
]
}


def get_my_questions(request):
if request.user.is_anonymous():
return None
Expand Down Expand Up @@ -62,7 +63,7 @@ def knowledge_list(request,
category = get_object_or_404(Category, slug=category_slug)
questions = questions.filter(categories=category)

paginator, questions = paginate(questions, 50,
paginator, questions = paginate(questions, 50,
request.GET.get('page', '1'))

return render(request, template, {
Expand All @@ -72,7 +73,7 @@ def knowledge_list(request,
'my_questions': get_my_questions(request),
'category': category,
'categories': Category.objects.all(),
'form': Form(request.user, initial={'title': search }), # prefill title
'form': Form(request.user, initial={'title': search}), # prefill title
'BASE': BASE
})

Expand Down Expand Up @@ -112,6 +113,7 @@ def knowledge_thread(request,
'BASE': BASE
})


def knowledge_moderate(
request,
lookup_id,
Expand Down Expand Up @@ -163,7 +165,6 @@ def knowledge_moderate(
return redirect(reverse('knowledge_index'))



def knowledge_ask(request,
template='django_knowledge/ask.html',
Form=QuestionForm,
Expand Down

0 comments on commit 9a47cdc

Please sign in to comment.