svn commit: r993642 - /tuscany/sca-cpp/trunk/modules/wsgi/scdl.py

[js...@apache.org]

Author: jsdelfino
Date: Wed Sep  8 07:27:09 2010
New Revision: 993642

URL: http://svn.apache.org/viewvc?rev=993642&view=rev
Log:
Add support nickname property to WSGI / GAE integration code.

Modified:
    tuscany/sca-cpp/trunk/modules/wsgi/scdl.py

Modified: tuscany/sca-cpp/trunk/modules/wsgi/scdl.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/scdl.py?rev=993642&r1=993641&r2=993642&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/scdl.py (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/scdl.py Wed Sep  8 07:27:09 2010
@@ -194,6 +194,8 @@ def evalProperty(p):
         return lambda: hostProperty(cadr(p), environ)
     if car(p) == "user":
         return lambda: userProperty(cadr(p))
+    if car(p) == "nickname":
+        return lambda: nicknameProperty(cadr(p))
     if car(p) == "email":
         return lambda: emailProperty(cadr(p))
     return lambda: cadr(p)
@@ -207,7 +209,11 @@ def currentUser():
 
 def userProperty(v):
     user = currentUser()
-    return user.user_id() if user else v
+    return user.federated_identity() if user else v
+
+def nicknameProperty(v):
+    user = currentUser()
+    return user.nickname() if user else v
 
 def hostProperty(v, e):
     return e.get("HTTP_HOST", e.get("SERVER_NAME", v)).split(":")[0]