More Py3 fixes.

zopefoundation · May 4, 2017 · ec9ebda · ec9ebda
1 parent 0005c7d
commit ec9ebda
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Products/ZCatalog/__init__.py b/src/Products/ZCatalog/__init__.py
@@ -13,7 +13,7 @@
 
 """ZCatalog product"""
 
-import ZCatalog
+from Products.ZCatalog import ZCatalog
 
 
 def initialize(context):

diff --git a/src/Products/ZCatalog/plan.py b/src/Products/ZCatalog/plan.py
@@ -17,13 +17,20 @@
 from collections import namedtuple
 from logging import getLogger
 from os import environ
-from thread import allocate_lock
+
 
 from Acquisition import aq_base
 from Acquisition import aq_parent
-from Products.PluginIndexes.interfaces import IUniqueValueIndex
 from zope.dottedname.resolve import resolve
 
+from Products.PluginIndexes.interfaces import IUniqueValueIndex
+
+try:
+    from _thread import allocate_lock
+except ImportError:  # PY2
+    from thread import allocate_lock
+
+
 MAX_DISTINCT_VALUES = 10
 REFRESH_RATE = 100
 VALUE_INDEX_KEY = 'VALUE_INDEXES'