From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 23 Dec 2012 05:48:20 +0000 (+0100)
Subject: Merge branch 'master' into jython
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=refs%2Fheads%2Fjython;hp=809f0edc1d621010d0cf62ced892f13ee24fde8e

Merge branch 'master' into jython
---

diff --git a/wrw/sp/cons.py b/wrw/sp/cons.py
index 9df4725..168f297 100644
--- a/wrw/sp/cons.py
+++ b/wrw/sp/cons.py
@@ -1,9 +1,7 @@
 import xml.dom.minidom
 
 class node(object):
-    def __str__(self):
-        doc = xml.dom.minidom.Document()
-        return self.__todom__(doc).toxml()
+    pass
 
 class text(node, unicode):
     def __todom__(self, doc):
@@ -23,9 +21,9 @@ class element(node):
 
     def __call__(self, *children, **attrs):
         for child in children:
-            self.children.append(self.ctx.nodefrom(child))
+            self.ctx.addchild(self, child)
         for k, v in attrs.iteritems():
-            self.attrs[unicode(k)] = unicode(v)
+            self.ctx.addattr(self, k, v)
         return self
 
     def __todom__(self, doc):
@@ -36,6 +34,10 @@ class element(node):
             el.appendChild(child.__todom__(doc))
         return el
 
+    def __str__(self):
+        doc = xml.dom.minidom.Document()
+        return self.__todom__(doc).toxml()
+
 class context(object):
     def __init__(self):
         self.nodeconv = {}
@@ -54,6 +56,12 @@ class context(object):
             return self.nodeconv[type(ob)](ob)
         raise Exception("No node conversion known for %s objects" % str(type(ob)))
 
+    def addchild(self, node, child):
+        node.children.append(self.nodefrom(child))
+
+    def addattr(self, node, k, v):
+        node.attrs[unicode(k)] = unicode(v)
+
 class constructor(object):
     def __init__(self, ns, elcls = element, ctx=None):
         self._ns = ns
diff --git a/wrw/sp/xhtml.py b/wrw/sp/xhtml.py
index 928dcd9..3c6c0f6 100644
--- a/wrw/sp/xhtml.py
+++ b/wrw/sp/xhtml.py
@@ -14,7 +14,15 @@ class htmlelement(_cons.element):
         doc.appendChild(self.__todom__(doc))
         return doc
 
+class xhtmlcontext(_cons.context):
+    attrmap = {u"klass": u"class"}
+
+    def addattr(self, node, k, v):
+        k = unicode(k)
+        node.attrs[self.attrmap.get(k, k)] = unicode(v)
+
 def cons(ctx=None):
+    if ctx is None: ctx = xhtmlcontext()
     return _cons.constructor(ns, htmlelement, ctx)
 
 def head(title=None, css=None):
diff --git a/wrw/wmako.py b/wrw/wmako.py
index 86bc201..92e3e65 100644
--- a/wrw/wmako.py
+++ b/wrw/wmako.py
@@ -1,7 +1,7 @@
 from __future__ import with_statement
 import os, threading
 from mako import template, lookup, filters
-import util, form, session, env
+import util, form, session, env, resp
 
 # It seems Mako isn't thread-safe.
 makolock = threading.Lock()
@@ -44,6 +44,8 @@ def handle(req, filename, **kw):
 
 @util.wsgiwrap
 def application(req):
+    if req.method not in ["GET", "HEAD"]:
+        raise resp.httperror(405)
     return handle(req, req.filename,
                   form = form.formdata(req),
                   session = session.get(req))