diff --git a/constance/admin.py b/constance/admin.py index 78a6af6..5a712bb 100644 --- a/constance/admin.py +++ b/constance/admin.py @@ -22,7 +22,10 @@ from constance import config, settings NUMERIC_WIDGET = forms.TextInput(attrs={'size': 10}) INTEGER_LIKE = (fields.IntegerField, {'widget': NUMERIC_WIDGET}) -STRING_LIKE = (fields.CharField, {'widget': forms.Textarea(attrs={'rows': 3}), 'required': False}) +STRING_LIKE = (fields.CharField, { + 'widget': forms.Textarea(attrs={'rows': 3}), + 'required': False, +}) FIELDS = { bool: (fields.BooleanField, {'required': False}), @@ -109,10 +112,11 @@ class ConstanceAdmin(admin.ModelAdmin): 'help_text': _(help_text), 'value': localize(value), 'modified': value != default, - 'form_field': form[name] + 'form_field': form[name], }) context['config'].sort(key=itemgetter('name')) - context_instance = RequestContext(request, current_app=self.admin_site.name) + context_instance = RequestContext(request, + current_app=self.admin_site.name) return render_to_response('admin/constance/change_list.html', context, context_instance=context_instance) @@ -125,8 +129,7 @@ class ConstanceAdmin(admin.ModelAdmin): def has_change_permission(self, request, obj=None): if settings.SUPERUSER_ONLY: return request.user.is_superuser - else: - return super(ConstanceAdmin, self).has_change_permission(request, obj) + return super(ConstanceAdmin, self).has_change_permission(request, obj) class Config(object): diff --git a/constance/backends/__init__.py b/constance/backends/__init__.py index a7f9f40..a64905e 100644 --- a/constance/backends/__init__.py +++ b/constance/backends/__init__.py @@ -2,6 +2,7 @@ Defines the base constance backend """ + class Backend(object): def get(self, key): diff --git a/constance/backends/database/__init__.py b/constance/backends/database/__init__.py index 77bd284..3a447cb 100644 --- a/constance/backends/database/__init__.py +++ b/constance/backends/database/__init__.py @@ -1,5 +1,3 @@ -import itertools - from django.core.exceptions import ImproperlyConfigured from django.db.models.signals import post_save from django.core.cache import get_cache diff --git a/constance/backends/database/migrations/0001_initial.py b/constance/backends/database/migrations/0001_initial.py index f8747dd..f9b7473 100644 --- a/constance/backends/database/migrations/0001_initial.py +++ b/constance/backends/database/migrations/0001_initial.py @@ -8,7 +8,8 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding model 'Constance' db.create_table('constance_config', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('id', self.gf('django.db.models.fields.AutoField')( + primary_key=True)), ('key', self.gf('django.db.models.fields.TextField')()), ('value', self.gf('picklefield.fields.PickledObjectField')()), )) @@ -20,8 +21,10 @@ class Migration(SchemaMigration): models = { 'database.constance': { - 'Meta': {'object_name': 'Constance', 'db_table': "'constance_config'"}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'Meta': {'object_name': 'Constance', + 'db_table': "'constance_config'"}, + 'id': ('django.db.models.fields.AutoField', [], + {'primary_key': 'True'}), 'key': ('django.db.models.fields.TextField', [], {}), 'value': ('picklefield.fields.PickledObjectField', [], {}) } diff --git a/constance/backends/database/migrations/0002_auto__chg_field_constance_key__add_unique_constance_key.py b/constance/backends/database/migrations/0002_auto__chg_field_constance_key__add_unique_constance_key.py index b06a6ac..691c820 100644 --- a/constance/backends/database/migrations/0002_auto__chg_field_constance_key__add_unique_constance_key.py +++ b/constance/backends/database/migrations/0002_auto__chg_field_constance_key__add_unique_constance_key.py @@ -7,7 +7,9 @@ class Migration(SchemaMigration): def forwards(self, orm): # Changing field 'Constance.key' - db.alter_column('constance_config', 'key', self.gf('django.db.models.fields.CharField')(unique=True, max_length=255)) + db.alter_column('constance_config', 'key', + self.gf('django.db.models.fields.CharField')( + unique=True, max_length=255)) # Adding unique constraint on 'Constance', fields ['key'] db.create_unique('constance_config', ['key']) @@ -16,13 +18,17 @@ class Migration(SchemaMigration): db.delete_unique('constance_config', ['key']) # Changing field 'Constance.key' - db.alter_column('constance_config', 'key', self.gf('django.db.models.fields.TextField')()) + db.alter_column('constance_config', 'key', + self.gf('django.db.models.fields.TextField')()) models = { 'database.constance': { - 'Meta': {'object_name': 'Constance', 'db_table': "'constance_config'"}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), + 'Meta': {'object_name': 'Constance', + 'db_table': "'constance_config'"}, + 'id': ('django.db.models.fields.AutoField', [], + {'primary_key': 'True'}), + 'key': ('django.db.models.fields.CharField', [], + {'unique': 'True', 'max_length': '255'}), 'value': ('picklefield.fields.PickledObjectField', [], {}) } } diff --git a/constance/config.py b/constance/config.py index ed2afbc..d7ef1a6 100644 --- a/constance/config.py +++ b/constance/config.py @@ -1,5 +1,6 @@ from constance import settings, utils + class Config(object): """ The global config wrapper that handles the backend. diff --git a/constance/context_processors.py b/constance/context_processors.py index fa7be62..3a3da33 100644 --- a/constance/context_processors.py +++ b/constance/context_processors.py @@ -1,5 +1,6 @@ import constance + def config(request): """ Simple context processor that puts the config into every diff --git a/constance/models.py b/constance/models.py index 6052640..e341795 100644 --- a/constance/models.py +++ b/constance/models.py @@ -1,4 +1,4 @@ -from django.db.models import get_models, signals +from django.db.models import signals def create_perm(app, created_models, verbosity, db, **kwargs): diff --git a/constance/settings.py b/constance/settings.py index 75ce98a..a53ac4a 100644 --- a/constance/settings.py +++ b/constance/settings.py @@ -8,7 +8,8 @@ settings = import_module_attr( REDIS_PREFIX = getattr(settings, 'CONSTANCE_REDIS_PREFIX', getattr(settings, 'CONSTANCE_PREFIX', 'constance:')) -BACKEND = getattr(settings, 'CONSTANCE_BACKEND', 'constance.backends.redisd.RedisBackend') +BACKEND = getattr(settings, 'CONSTANCE_BACKEND', + 'constance.backends.redisd.RedisBackend') CONFIG = getattr(settings, 'CONSTANCE_CONFIG', {}) diff --git a/constance/utils.py b/constance/utils.py index f6dc970..96fc572 100644 --- a/constance/utils.py +++ b/constance/utils.py @@ -1,5 +1,6 @@ from django.utils.importlib import import_module + def import_module_attr(path): package, module = path.rsplit('.', 1) return getattr(import_module(package), module)