Fix imports from Globals that was removed in Zope4

plone · Oct 23, 2016 · 62fd8bc · 62fd8bc
1 parent 1f242a7
commit 62fd8bc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -14,6 +14,9 @@ New features:
 
 Bug fixes:
 
+- Fix imports from Globals that was removed in Zope4
+  [pbauer]
+
 - Require plone.app.imaging even if Plone itself does not. [davisagli]
 
 

diff --git a/Products/ATContentTypes/configuration/config.py b/Products/ATContentTypes/configuration/config.py
@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
-from Globals import INSTANCE_HOME
 from Products.ATContentTypes.configuration.schema import atctSchema
 from ZConfig.loader import ConfigLoader
 
 import os
 
 
 # directories
-INSTANCE_ETC = os.path.join(INSTANCE_HOME, 'etc')
+INSTANCE_ETC = os.path.join(os.environ.get('INSTANCE_HOME'), 'etc')
 _here = os.path.dirname(__file__)
 ATCT_HOME = os.path.dirname(os.path.abspath(os.path.join(_here)))
 ATCT_ETC = os.path.join(ATCT_HOME, 'etc')