From 251b2fd0b8a08d94b7b953cec190390377fe1be2 Mon Sep 17 00:00:00 2001 From: Kevin Glavin Date: Fri, 28 Feb 2014 22:14:25 -0500 Subject: [PATCH] PEP 8 updates --- tekextensions/context_processors.py | 8 ++++++-- tekextensions/forms.py | 9 +++++---- tekextensions/views.py | 7 ++++--- tekextensions/widgets.py | 4 ++++ 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/tekextensions/context_processors.py b/tekextensions/context_processors.py index 5a626bc..4428df1 100644 --- a/tekextensions/context_processors.py +++ b/tekextensions/context_processors.py @@ -1,13 +1,17 @@ from django.conf import settings from django.contrib.sites.models import Site, RequestSite + def admin_media_prefix(request): return {'ADMIN_MEDIA_PREFIX': settings.ADMIN_MEDIA_PREFIX } + def current_site(request): - ''' + """ A context processor to add the "current_site" to the current Context - ''' + + """ + context_name = 'CURRENT_SITE' try: diff --git a/tekextensions/forms.py b/tekextensions/forms.py index a9cf7b6..6365199 100644 --- a/tekextensions/forms.py +++ b/tekextensions/forms.py @@ -1,14 +1,16 @@ 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): - if (model_name.lower() == model_name): + if model_name.lower() == model_name: normal_model_name = model_name.capitalize() else: normal_model_name = model_name return normal_model_name + def get_model_form(model_name): app_list = get_apps() for app in app_list: @@ -17,5 +19,4 @@ def get_model_form(model_name): form = modelform_factory(model) return form - raise Exception('Did not find the model %s' % (model_name)) - + raise Exception('Did not find the model %s' % model_name) diff --git a/tekextensions/views.py b/tekextensions/views.py index 76dd7a6..b081c08 100644 --- a/tekextensions/views.py +++ b/tekextensions/views.py @@ -5,6 +5,7 @@ from django.forms import ValidationError from tekextensions.forms import get_model_form, normalize_model_name + def add_new_model(request, model_name, form=None): normal_model_name = normalize_model_name(model_name) @@ -20,12 +21,12 @@ def add_new_model(request, model_name, form=None): new_obj = None if new_obj: - return HttpResponse('' % \ + return HttpResponse( + '' % (escape(new_obj._get_pk_val()), escape(new_obj))) else: form = form() 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)) \ No newline at end of file diff --git a/tekextensions/widgets.py b/tekextensions/widgets.py index d640943..4417a7c 100644 --- a/tekextensions/widgets.py +++ b/tekextensions/widgets.py @@ -2,6 +2,7 @@ from django.template.loader import render_to_string from django.contrib.admin.widgets import FilteredSelectMultiple + class PopUpBaseWidget(object): def __init__(self, model=None, template='addnew.html', *args, **kwargs): self.model = model @@ -25,11 +26,14 @@ def _media(self): ) media = property(_media) + class FilteredMultipleSelectWithPopUp(PopUpBaseWidget, FilteredSelectMultiple): pass + class MultipleSelectWithPopUp(PopUpBaseWidget, forms.SelectMultiple): pass + class SelectWithPopUp(PopUpBaseWidget, forms.Select): pass