Merge remote-tracking branch 'nexedi/master' into zope4py2

bt5/erp5_data_notebook/TestTemplateItem/portal_components/test.erp5.testExecuteJupyter.py

@@ -757,9 +757,9 @@ context.Base_renderAsHtml(iframe)
 
     # The big hash in this string was previous calculated using the expect hash
     # of the pivot table page's html.
-    pivottable_frame_display_path = 'Base_displayPivotTableFrame?key=853524757258b19805d13beb8c6bd284a7af4a974a96a3e5a4847885df069a74d3c8c1843f2bcc4d4bb3c7089194b57c90c14fe8dd0c776d84ce0868e19ac411'
+    pivottable_frame_display_path = 'Base_displayPivotTableFrame?key=58498be478377296776617d058c67b94ef7259fd519f5274ea9837b136c380fb12d009f5f84af95b309d19803863a3ccdc75f64f912fd7095c0cff77a311c945'
 
-    self.assertTrue(pivottable_frame_display_path in json_result['code_result'])
+    self.assertIn(pivottable_frame_display_path, json_result['code_result'])
 
   def testConsecutiveImports(self):
     '''

bt5/erp5_run_my_doc/ExtensionTemplateItem/portal_components/extension.erp5.ERP5RunMyDocs.py

@@ -77,7 +77,7 @@ def extractTest(text):
           testcode += row[0].text
         else:
           testcode += lxml.html.tostring(row)
-  return testcode
+  return testcode.strip()
 
 """
   HTML5 Presentation validador

bt5/erp5_run_my_doc/TestTemplateItem/portal_components/test.erp5.testRunMyDoc.py

@@ -34,7 +34,7 @@ class TestRunMyDoc(ERP5TypeTestCase):
   """
    Basic Test for internal implementation of RunMyDocs
   """
-
+  maxDiff = None
   def getTitle(self):
     return "Run My Doc"
 

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_hashVariationCategoryItemList.py

@@ -14,7 +14,7 @@ for item in item_list:
 
   # Hash key from item_value
   item_split = item_value.split('/')
-  item_key = '/'.join(item_split[:split_depth] , '/' )
+  item_key = '/'.join(item_split[:split_depth])
 
   if item_key not in sub_field_dict:
     # Create property dict