merge hernani -> trunk

[osqa.git] / forum_modules / openidauth / settings.py

diff --git a/forum_modules/openidauth/settings.py b/forum_modules/openidauth/settings.py
old mode 100755 (executable)
new mode 100644 (file)
index 3b1c2ee..f7c641a
--- a/forum_modules/openidauth/settings.py
+++ b/forum_modules/openidauth/settings.py
@@ -1,9 +1,9 @@
-OPENID_SREG = {\r
-    "required": "nickname, email",\r
-    "optional": "postcode, country",\r
-    "policy_url": ""\r
-}\r
-OPENID_AX = [\r
-            {"type_uri": "http://axschema.org/contact/email", "count": 1, "required": True, "alias": "email"},\r
-            {"type_uri": "fullname", "count":1 , "required": False, "alias": "fullname"}\r
+OPENID_SREG = {
+    "required": "nickname, email",
+    "optional": "postcode, country",
+    "policy_url": ""
+}
+OPENID_AX = [
+            {"type_uri": "http://axschema.org/contact/email", "count": 1, "required": True, "alias": "email"},
+            {"type_uri": "fullname", "count":1 , "required": False, "alias": "fullname"}
         ]
\ No newline at end of file