changeset 4394:0b9869467641

merged moin/1.7
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 26 Oct 2008 12:26:37 -0700
parents df4c0a1fa898 (current diff) 911cb338943e (diff)
children 17ede26a8237
files MoinMoin/request/__init__.py
diffstat 3 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/serveopenid.py	Thu Oct 09 21:45:14 2008 +0200
+++ b/MoinMoin/action/serveopenid.py	Sun Oct 26 12:26:37 2008 -0700
@@ -11,8 +11,8 @@
 from MoinMoin.support.python_compatibility import rsplit
 from MoinMoin.util.moinoid import MoinOpenIDStore, strbase64
 from MoinMoin import wikiutil
-from openid.consumer.discover import (OPENID_1_0_TYPE,
-    OPENID_1_1_TYPE, OPENID_2_0_TYPE, OPENID_IDP_2_0_TYPE)
+from openid.consumer.discover import OPENID_1_0_TYPE, \
+    OPENID_1_1_TYPE, OPENID_2_0_TYPE, OPENID_IDP_2_0_TYPE
 from openid import sreg
 from openid.cryptutil import randomString
 from openid.server import server
--- a/MoinMoin/request/__init__.py	Thu Oct 09 21:45:14 2008 +0200
+++ b/MoinMoin/request/__init__.py	Sun Oct 26 12:26:37 2008 -0700
@@ -455,7 +455,8 @@
         """
         self.is_ssl = bool(env.get('SSL_PROTOCOL') or
                            env.get('SSL_PROTOCOL_VERSION') or
-                           env.get('HTTPS') == 'on')
+                           env.get('HTTPS', 'off').lower() in ('on', '1') or
+                           env.get('wsgi.url_scheme') == 'https')
 
     def setHost(self, host=None):
         """ Set http_host
--- a/jabberbot/capat.py	Thu Oct 09 21:45:14 2008 +0200
+++ b/jabberbot/capat.py	Sun Oct 26 12:26:37 2008 -0700
@@ -50,7 +50,7 @@
     ident = list(identities)
     # default sorting already considers both, category and type
     ident.sort()
-    ident = ('%s/%s' % (idcat, idtype) for idcat, idtype in ident)
+    ident = ['%s/%s' % (idcat, idtype) for idcat, idtype in ident]
 
     feat = list(features)
     # strings (byte arrays) are ordered by i;octet by default