Update Copyright header point to COPYING file

[cascardo/ipsilon.git] / ipsilon / providers / openid / meta.py

diff --git a/ipsilon/providers/openid/meta.py b/ipsilon/providers/openid/meta.py
old mode 100755 (executable)
new mode 100644 (file)
index a04a78c..27017c5
--- a/ipsilon/providers/openid/meta.py
+++ b/ipsilon/providers/openid/meta.py
@@ -1,6 +1,4 @@
-#!/usr/bin/python
-#
-# Copyright (C) 2014  Ipsilon project Contributors, for licensee see COPYING
+# Copyright (C) 2014 Ipsilon project Contributors, for license see COPYING
 
 from ipsilon.providers.common import ProviderPageBase
 
@@ -11,18 +9,13 @@ class MetaHandler(ProviderPageBase):
 
     def __init__(self, *args, **kwargs):
         super(MetaHandler, self).__init__(*args, **kwargs)
-        self.default_headers.update({
-            'Cache-Control': 'no-cache, must-revalidate',
-            'Pragma': 'no-cache',
-            'Expires': 'Thu, 01 Dec 1994 16:00:00 GMT',
-        })
         self._template_name = None
         self._take_args = False
 
     def reply(self, **kwargs):
         if self._template_name is None:
             raise ValueError('Template not set')
-        return self._template(self._template_name, **kwargs)
+        return str(self._template(self._template_name, **kwargs))
 
     def default(self, *args, **kwargs):
         if self._take_args:
@@ -42,7 +35,7 @@ class XRDSHandler(MetaHandler):
             'http://specs.openid.net/auth/2.0/server',
             'http://openid.net/server/1.0',
         ]
-        for _, e in self.cfg.extensions.items():
+        for _, e in self.cfg.extensions.available().items():
             types.extend(e.get_type_uris())
 
         return self.reply(types=types,
@@ -65,7 +58,7 @@ class UserXRDSHandler(XRDSHandler):
                 'http://specs.openid.net/auth/2.0/signon',
                 'http://openid.net/signon/1.0',
             ]
-            for _, e in self.cfg.extensions.items():
+            for _, e in self.cfg.extensions.available().items():
                 types.extend(e.get_type_uris())
 
             return self.reply(types=types,