# HG changeset patch
# User Aurelien Campeas <aurelien.campeas@logilab.fr>
# Date 1271322044 -7200
# Node ID b4bb59824d7275eaacb20c74406b7df488d268f4
# Parent  7bac6791bbc287d563f5cd15e5b03379e172eadf# Parent  9c765b1d825094815fc7967566c948f5484d79fc
merge

diff -r 7bac6791bbc2 -r b4bb59824d72 devtools/testlib.py
--- a/devtools/testlib.py	Thu Apr 15 10:59:49 2010 +0200
+++ b/devtools/testlib.py	Thu Apr 15 11:00:44 2010 +0200
@@ -492,9 +492,9 @@
     def app_publish(self, req, path='view'):
         return self.app.publish(path, req)
 
-    def ctrl_publish(self, req):
+    def ctrl_publish(self, req, ctrl='edit'):
         """call the publish method of the edit controller"""
-        ctrl = self.vreg['controllers'].select('edit', req)
+        ctrl = self.vreg['controllers'].select(ctrl, req)
         try:
             result = ctrl.publish()
             req.cnx.commit()
diff -r 7bac6791bbc2 -r b4bb59824d72 etwist/server.py
--- a/etwist/server.py	Thu Apr 15 10:59:49 2010 +0200
+++ b/etwist/server.py	Thu Apr 15 11:00:44 2010 +0200
@@ -283,11 +283,11 @@
 from twisted.internet import defer
 from twisted.web2 import fileupload
 
-# XXX set max file size to 100Mo: put max upload size in the configuration
+# XXX set max file size to 200Mo: put max upload size in the configuration
 # line below for twisted >= 8.0, default param value for earlier version
-resource.PostableResource.maxSize = 100*1024*1024
+resource.PostableResource.maxSize = 200*1024*1024
 def parsePOSTData(request, maxMem=100*1024, maxFields=1024,
-                  maxSize=100*1024*1024):
+                  maxSize=200*1024*1024):
     if request.stream.length == 0:
         return defer.succeed(None)
 
diff -r 7bac6791bbc2 -r b4bb59824d72 web/views/debug.py
--- a/web/views/debug.py	Thu Apr 15 10:59:49 2010 +0200
+++ b/web/views/debug.py	Thu Apr 15 11:00:44 2010 +0200
@@ -165,5 +165,5 @@
         self.wview('pyvaltable', pyvalue=values[:self._cw.form.get('nb', 20)])
         if garbage:
             self.w(u'<h3>%s</h3>' % _('Unreachable objects'))
-            values = sorted(xml_escape(repr(o) for o in garbage))
+            values = sorted(xml_escape(repr(o)) for o in garbage)
             self.wview('pyvallist', pyvalue=values)