Update to lxml >= 4.2.

zopefoundation · Nov 10, 2018 · f080498 · f080498
1 parent 311760d
commit f080498
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,6 @@ python:
 install:
     - pip install -U pip setuptools
     - pip install -U coverage coveralls zope.testrunner
-    - pip install -r requirements.txt
     - pip install -U -e .[test]
 script:
     - coverage run -m zope.testrunner --test-path=src

diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.py b/setup.py
@@ -83,7 +83,7 @@ def alltests():
             'zope.pagetemplate >= 3.6.2',
         ],
         test=[
-            'lxml >= 2.1.1, <4.2',
+            'lxml >= 4.2',
             'persistent',
             'z3c.template >= 1.3',
             'zc.sourcefactory',
@@ -120,7 +120,7 @@ def alltests():
         'zope.traversing',
     ],
     tests_require=[
-        'lxml >= 2.1.1, <4.2',
+        'lxml >= 4.2',
         'persistent',
         'z3c.template >= 1.3',
         'zc.sourcefactory',

diff --git a/src/z3c/form/browser/multi_dict_integration.rst b/src/z3c/form/browser/multi_dict_integration.rst
@@ -408,8 +408,7 @@ Submit again with the empty field:
   >>> content = getForm(request, 'MultiWidget_dict_edit_submit_choice2.html')
   >>> print(testing.plainText(content,
   ...     './/form/div[@id="row-form-widgets-dictOfChoice"]//div[@class="error"]'))
-  Required input is missing.
-  Required input is missing.
+  Duplicate key
 
 Let's remove some items:
 

diff --git a/src/z3c/form/browser/object_multi_dict_integration.rst b/src/z3c/form/browser/object_multi_dict_integration.rst
@@ -179,7 +179,6 @@ Submit again with the empty field:
   Required input is missing.
   Required input is missing.
   Required input is missing.
-  Required input is missing.
 
   >>> print(testing.plainText(content,
   ...     './/div[@id="form-widgets-dictOfObject-1-row"]//div[@class="error"]'))
@@ -206,8 +205,7 @@ Submit again with the empty field:
   Required input is missing.
   ( ) yes ( ) no
   Choice label *
-  Required input is missing.
-  [[    ]]
+  [one]
   ChoiceOpt label
   [No value]
   TextLine label *
@@ -326,7 +324,6 @@ Submit again with the empty field:
   Required input is missing.
   Required input is missing.
   Required input is missing.
-  Required input is missing.
 
   >>> print(testing.plainText(content,
   ...     './/div[@id="form-widgets-dictOfObject-1-row"]//div[@class="error"]'))
@@ -479,8 +476,7 @@ Fill in a valid value:
   Required input is missing.
   ( ) yes ( ) no
   Choice label *
-  Required input is missing.
-  [[    ]]
+  [one]
   ChoiceOpt label
   [No value]
   TextLine label *

diff --git a/src/z3c/form/browser/object_multi_list_integration.rst b/src/z3c/form/browser/object_multi_list_integration.rst
@@ -185,8 +185,7 @@ Submit again with the empty field:
   Required input is missing.
   ( ) yes ( ) no
   Choice label *
-  Required input is missing.
-  [[    ]]
+  [one]
   ChoiceOpt label
   [No value]
   TextLine label *
@@ -303,7 +302,6 @@ Submit again with the empty field:
   Required input is missing.
   Required input is missing.
   Required input is missing.
-  Required input is missing.
 
 Let's remove some items:
 
@@ -467,8 +465,7 @@ And fill in a valid value:
   Required input is missing.
   ( ) yes ( ) no
   Choice label *
-  Required input is missing.
-  [[    ]]
+  [one]
   ChoiceOpt label
   [No value]
   TextLine label *
@@ -487,8 +484,7 @@ And fill in a valid value:
   Required input is missing.
   ( ) yes ( ) no
   Choice label *
-  Required input is missing.
-  [[    ]]
+  [one]
   ChoiceOpt label
   [No value]
   TextLine label *
@@ -538,8 +534,7 @@ Let's remove some items:
   Required input is missing.
   ( ) yes ( ) no
   Choice label *
-  Required input is missing.
-  [[    ]]
+  [one]
   ChoiceOpt label
   [No value]
   TextLine label *