changeset 4393:911cb338943e

Python 2.3 compatibility fixes (thanks to Greg Ward)
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 26 Oct 2008 12:21:42 -0700
parents bf543d0796c8
children 0b9869467641 4a125e9b0a6e
files MoinMoin/action/serveopenid.py jabberbot/capat.py
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/serveopenid.py	Sat Oct 11 22:04:06 2008 +0200
+++ b/MoinMoin/action/serveopenid.py	Sun Oct 26 12:21:42 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/jabberbot/capat.py	Sat Oct 11 22:04:06 2008 +0200
+++ b/jabberbot/capat.py	Sun Oct 26 12:21:42 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