Merge branch 'master' into argument-conversion

zopefoundation · Apr 18, 2019 · 4752fa5 · 4752fa5
2 parents bf2844b + f677ed7
commit 4752fa5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -43,7 +43,7 @@ Other changes
 
 - Always keep action buttons visible on the content list for large folders
   (`#537 <https://github.com/zopefoundation/Zope/issues/537>`_)
-  
+
 - Make showing the ZMI modal add dialog configurable per product
   (`#535 <https://github.com/zopefoundation/Zope/issues/535>`_)
 
@@ -68,6 +68,9 @@ Other changes
 - provided method to get breadcrumb length to prevent ZMI errors
   (`#533 <https://github.com/zopefoundation/Zope/issues/533>`_)
 
+- add zodbupdate_rename_dict to move webdav.LockItem to OFS.LockItem
+  (`Products.CMFPlone#2800 <https://github.com/plone/Products.CMFPlone/issues/2800>`_)
+
 
 4.0b10 (2019-03-08)
 -------------------

diff --git a/setup.py b/setup.py
@@ -145,5 +145,8 @@ def _read_file(filename):
         'zodbupdate.decode': [
             'decodes = OFS:zodbupdate_decode_dict',
         ],
+        'zodbupdate': [
+            'renames = OFS:zodbupdate_rename_dict',
+        ],
     },
 )
diff --git a/src/OFS/__init__.py b/src/OFS/__init__.py
@@ -13,3 +13,7 @@
     'OFS.OrderedFolder OrderedFolder title': 'utf-8',
     'OFS.userfolder UserFolder title': 'utf-8',
 }
+
+zodbupdate_rename_dict = {
+    'webdav.LockItem LockItem': 'OFS.LockItem LockItem',
+}