Merge 04de7dc into 596794b

plone · Jan 8, 2019 · 084e119 · 084e119
2 parents 596794b + 04de7dc
commit 084e119
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -14,7 +14,8 @@ New features:
 
 Bug fixes:
 
-- *add item here*
+- Python 3 compatibility for generated bin/zeopack script
+  [ajung]
 
 
 2.0.0 (2018-12-03)

diff --git a/src/plone/recipe/zeoserver/recipe.py b/src/plone/recipe/zeoserver/recipe.py
@@ -390,11 +390,11 @@ def install_scripts(self):
             arguments_info += ("import getopt; opts = "
                                "getopt.getopt(sys.argv[1:], 'S:B:D:W1')[0];\n"
                                "opts = dict(opts)\n"
-                               "storage = opts.has_key('-S') and "
+                               "storage = opts.get('-S') and "
                                "opts['-S'] or storage\n"
-                               "blob_dir = opts.has_key('-B') and "
+                               "blob_dir = opts.get('-B') and "
                                "opts['-B'] or blob_dir\n"
-                               "days = opts.has_key('-D') and "
+                               "days = opts.get('-D') and "
                                "opts['-D'] or days\n"
                                )