Skip to content

Commit

Permalink
PEP 8 updates
Browse files Browse the repository at this point in the history
  • Loading branch information
archen committed Mar 1, 2014
1 parent ab2a4b7 commit 251b2fd
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 9 deletions.
8 changes: 6 additions & 2 deletions tekextensions/context_processors.py
@@ -1,13 +1,17 @@
from django.conf import settings from django.conf import settings
from django.contrib.sites.models import Site, RequestSite from django.contrib.sites.models import Site, RequestSite



def admin_media_prefix(request): def admin_media_prefix(request):
return {'ADMIN_MEDIA_PREFIX': settings.ADMIN_MEDIA_PREFIX } return {'ADMIN_MEDIA_PREFIX': settings.ADMIN_MEDIA_PREFIX }



def current_site(request): def current_site(request):
''' """
A context processor to add the "current_site" to the current Context A context processor to add the "current_site" to the current Context
'''
"""

context_name = 'CURRENT_SITE' context_name = 'CURRENT_SITE'


try: try:
Expand Down
9 changes: 5 additions & 4 deletions tekextensions/forms.py
@@ -1,14 +1,16 @@
from django.forms.models import modelform_factory from django.forms.models import modelform_factory
from django.db.models.loading import get_models, get_app, get_apps from django.db.models.loading import get_models, get_apps



def normalize_model_name(model_name): def normalize_model_name(model_name):
if (model_name.lower() == model_name): if model_name.lower() == model_name:
normal_model_name = model_name.capitalize() normal_model_name = model_name.capitalize()
else: else:
normal_model_name = model_name normal_model_name = model_name


return normal_model_name return normal_model_name



def get_model_form(model_name): def get_model_form(model_name):
app_list = get_apps() app_list = get_apps()
for app in app_list: for app in app_list:
Expand All @@ -17,5 +19,4 @@ def get_model_form(model_name):
form = modelform_factory(model) form = modelform_factory(model)
return form return form


raise Exception('Did not find the model %s' % (model_name)) raise Exception('Did not find the model %s' % model_name)

7 changes: 4 additions & 3 deletions tekextensions/views.py
Expand Up @@ -5,6 +5,7 @@
from django.forms import ValidationError from django.forms import ValidationError
from tekextensions.forms import get_model_form, normalize_model_name from tekextensions.forms import get_model_form, normalize_model_name



def add_new_model(request, model_name, form=None): def add_new_model(request, model_name, form=None):
normal_model_name = normalize_model_name(model_name) normal_model_name = normalize_model_name(model_name)


Expand All @@ -20,12 +21,12 @@ def add_new_model(request, model_name, form=None):
new_obj = None new_obj = None


if new_obj: if new_obj:
return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, "%s", "%s");</script>' % \ return HttpResponse(
'<script type="text/javascript">opener.dismissAddAnotherPopup(window, "%s", "%s");</script>' %
(escape(new_obj._get_pk_val()), escape(new_obj))) (escape(new_obj._get_pk_val()), escape(new_obj)))


else: else:
form = form() form = form()


page_context = {'form': form, 'field': normal_model_name} page_context = {'form': form, 'field': normal_model_name}
return render_to_response('popup.html', page_context, context_instance=RequestContext(request)) return render_to_response('popup.html', page_context, context_instance=RequestContext(request))

4 changes: 4 additions & 0 deletions tekextensions/widgets.py
Expand Up @@ -2,6 +2,7 @@
from django.template.loader import render_to_string from django.template.loader import render_to_string
from django.contrib.admin.widgets import FilteredSelectMultiple from django.contrib.admin.widgets import FilteredSelectMultiple



class PopUpBaseWidget(object): class PopUpBaseWidget(object):
def __init__(self, model=None, template='addnew.html', *args, **kwargs): def __init__(self, model=None, template='addnew.html', *args, **kwargs):
self.model = model self.model = model
Expand All @@ -25,11 +26,14 @@ def _media(self):
) )
media = property(_media) media = property(_media)



class FilteredMultipleSelectWithPopUp(PopUpBaseWidget, FilteredSelectMultiple): class FilteredMultipleSelectWithPopUp(PopUpBaseWidget, FilteredSelectMultiple):
pass pass



class MultipleSelectWithPopUp(PopUpBaseWidget, forms.SelectMultiple): class MultipleSelectWithPopUp(PopUpBaseWidget, forms.SelectMultiple):
pass pass



class SelectWithPopUp(PopUpBaseWidget, forms.Select): class SelectWithPopUp(PopUpBaseWidget, forms.Select):
pass pass

0 comments on commit 251b2fd

Please sign in to comment.