Migrate to Django 1.6

[osqa.git] / forum / settings / __init__.py

diff --git a/forum/settings/__init__.py b/forum/settings/__init__.py
index 87b80a183595dfe06596b701e3fb569fa5fb1d2e..145859921fdcdc98c10c2a501da51a27d7f2a973 100644 (file)
--- a/forum/settings/__init__.py
+++ b/forum/settings/__init__.py
@@ -1,18 +1,20 @@
 import os.path
-from base import Setting, SettingSet
+from base import Setting, SettingSet, BaseSetting
 
 from django.forms.widgets import Textarea
 from django.utils.translation import ugettext_lazy as _
 from django.conf import settings as djsettings
-from django.utils.version import get_svn_revision
+from django.utils.version import get_git_changeset
+
+from forum.modules import get_modules_script_implementations
 
 OSQA_VERSION = "Development Build"
 
-SVN_REVISION = get_svn_revision(djsettings.SITE_SRC_ROOT)
+VCS_REVISION = get_git_changeset()
 
 # We'll have to keep in mind this variable on every release.
-if SVN_REVISION == u'SVN-unknown':
-    SVN_REVISION = u'SVN-1000'
+if VCS_REVISION == u'SVN-unknown':
+    VCS_REVISION = u'SVN-1000'
 
 MAINTAINANCE_MODE = Setting('MAINTAINANCE_MODE', None)
 
@@ -48,14 +50,15 @@ from urls import *
 from accept import *
 from sitemaps import *
 
+__all__ = locals().keys()
+
 # Be able to import all module settings as well
-for m in djsettings.MODULE_LIST:
-    try:
-        exec 'from %s.settings import *' % m.__name__
-    except:
-        pass
+for k,v in get_modules_script_implementations('settings', BaseSetting).items():
+   if not k in __all__:
+        __all__.append(k)
+        exec "%s = v" % k
+
 
 BADGES_SET = SettingSet('badges', _('Badges config'), _("Configure badges on your OSQA site."), 500)
 
-#__all__ = locals().keys()