[Erp5-report] r34725 nicolas - /erp5/trunk/utils/erp5mechanize/ERP5Mechanize.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Thu Apr 22 14:12:58 2010
New Revision: 34725

URL: http://svn.erp5.org?rev=34725&view=rev
Log:
Small fixes:
  1 - Be more tolerant when parser find multiple forms.
  2 - add mandatory argument to addFile method with the name of
file field.
  3 - Fix typo in assert method (Thx jerome)

Modified:
    erp5/trunk/utils/erp5mechanize/ERP5Mechanize.py

Modified: erp5/trunk/utils/erp5mechanize/ERP5Mechanize.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5mechanize/ERP5Mechanize.py?rev=34725&r1=34724&r2=34725&view=diff
==============================================================================
--- erp5/trunk/utils/erp5mechanize/ERP5Mechanize.py [utf8] (original)
+++ erp5/trunk/utils/erp5mechanize/ERP5Mechanize.py [utf8] Thu Apr 22 14:12:58 2010
@@ -117,20 +117,20 @@
       Selects the main form of current page.
     """
     def predicate(form):
-      return form.attrs['id'] == 'main_form'
+      return form.attrs.get('id', None) == 'main_form'
     self.browser.select_form(predicate=predicate)
 
   def fillField(self, name, value):
     self.selectMainForm()
     self.browser[name] = value
 
-  def addFile(self, file_object, mimetype=None, filename=None):
+  def addFile(self, file_object, name, mimetype=None, filename=None):
     self.selectMainForm()
-    self.browser.add_file(file_object, mimetype, filename)
+    self.browser.add_file(file_object, mimetype, filename, name=name)
 
   def assertResponseURL(self, url):
     response = self.browser.response()
-    assert response._url, url
+    assert response._url == url, '%s == %s' % (response._url, url)
 
   def checkCheckbox(self, name, index=0, state=True):
     """