diff --git a/appconf/__init__.py b/appconf/__init__.py index a8d00d8..be19281 100644 --- a/appconf/__init__.py +++ b/appconf/__init__.py @@ -1,5 +1,4 @@ from __future__ import absolute_import from .base import AppConf # noqa -# following PEP 386 -__version__ = "0.6" +__version__ = "1.0" diff --git a/appconf/base.py b/appconf/base.py index ffe246d..f910e56 100644 --- a/appconf/base.py +++ b/appconf/base.py @@ -1,6 +1,9 @@ -from django.core.exceptions import ImproperlyConfigured import sys + import six + +from django.core.exceptions import ImproperlyConfigured + from .utils import import_attribute @@ -108,7 +111,6 @@ class AppConf(six.with_metaclass(AppConfMetaClass)): An app setting object to be used for handling app setting defaults gracefully and providing a nice API for them. """ - def __init__(self, **kwargs): for name, value in six.iteritems(kwargs): setattr(self, name, value) @@ -142,6 +144,5 @@ class AppConf(six.with_metaclass(AppConfMetaClass)): """ Hook for doing any extra configuration, returning a dictionary containing the configured data. - """ return self.configured_data