Merge branch 'threadsafe_requestholder' into update_django

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

diff --git a/forum/settings/extkeys.py b/forum/settings/extkeys.py
index 9d439df0b7ba5939d391a0da7cccea6cfa6a6e54..11b43e311d7543d3cb50497f9f3dbb7549de0ea8 100644 (file)
--- a/forum/settings/extkeys.py
+++ b/forum/settings/extkeys.py
@@ -1,15 +1,15 @@
-from base import Setting, SettingSet\r
-from django.utils.translation import ugettext_lazy as _\r
-\r
-EXT_KEYS_SET = SettingSet('extkeys', _('External Keys'), _("Keys for various external providers that your application may optionally use."), 100)\r
-\r
-GOOGLE_SITEMAP_CODE = Setting('GOOGLE_SITEMAP_CODE', '', EXT_KEYS_SET, dict(\r
-label = _("Google sitemap code"),\r
-help_text = _("This is the code you get when you register your site at <a href='https://www.google.com/webmasters/tools/'>Google webmaster central</a>."),\r
-required=False))\r
-\r
-GOOGLE_ANALYTICS_KEY = Setting('GOOGLE_ANALYTICS_KEY', '', EXT_KEYS_SET, dict(\r
-label = _("Google analytics key"),\r
-help_text = _("Your Google analytics key. You can get one at the <a href='http://www.google.com/analytics/'>Google analytics official website</a>"),\r
-required=False))\r
-\r
+from base import Setting, SettingSet
+from django.utils.translation import ugettext_lazy as _
+
+EXT_KEYS_SET = SettingSet('extkeys', _('External Keys'), _("Keys for various external providers that your application may optionally use."), 100)
+
+GOOGLE_SITEMAP_CODE = Setting('GOOGLE_SITEMAP_CODE', '', EXT_KEYS_SET, dict(
+label = _("Google sitemap code"),
+help_text = _("This is the code you get when you register your site at <a href='https://www.google.com/webmasters/tools/'>Google webmaster central</a>."),
+required=False))
+
+GOOGLE_ANALYTICS_KEY = Setting('GOOGLE_ANALYTICS_KEY', '', EXT_KEYS_SET, dict(
+label = _("Google analytics key"),
+help_text = _("Your Google analytics key. You can get one at the <a href='http://www.google.com/analytics/'>Google analytics official website</a>"),
+required=False))
+