summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Vagelpohl <jens@dataflake.org>2009-11-06 08:58:03 +0000
committerJens Vagelpohl <jens@dataflake.org>2009-11-06 08:58:03 +0000
commita51c58cb19705940aef05dd0cc40b1d158ca4754 (patch)
treecde03d293ce6f52b60b86f8b4f668a617b64b3b3
parent362e204f900a273ae87327fcdd55e519bcdc5399 (diff)
downloadProducts.MaildropHost-a51c58cb19705940aef05dd0cc40b1d158ca4754.zip
Products.MaildropHost-a51c58cb19705940aef05dd0cc40b1d158ca4754.tar.gz
- Bug: Convert imports from Globals to silence deprecation
warnings under Zope 2.12 git-svn-id: file:///svn-public/Products.MaildropHost/trunk@1818 835909ba-7c00-0410-bfa4-884f43845301
-rw-r--r--Products/MaildropHost/CHANGES.txt3
-rw-r--r--Products/MaildropHost/MaildropHost.py6
-rw-r--r--Products/MaildropHost/tests/test_MaildropHost.py2
3 files changed, 7 insertions, 4 deletions
diff --git a/Products/MaildropHost/CHANGES.txt b/Products/MaildropHost/CHANGES.txt
index a47af79..f4b68f4 100644
--- a/Products/MaildropHost/CHANGES.txt
+++ b/Products/MaildropHost/CHANGES.txt
@@ -4,6 +4,9 @@ MaildropHost change log
2.4 (unreleased)
----------------
+- Bug: Convert imports from Globals to silence deprecation
+ warnings under Zope 2.12
+
2.3 (2009-10-09)
----------------
diff --git a/Products/MaildropHost/MaildropHost.py b/Products/MaildropHost/MaildropHost.py
index c12714d..7bc6c81 100644
--- a/Products/MaildropHost/MaildropHost.py
+++ b/Products/MaildropHost/MaildropHost.py
@@ -26,10 +26,10 @@ import urllib
from AccessControl import ClassSecurityInfo
from AccessControl.Permissions import change_configuration
from Acquisition import aq_base
+from App.class_init import default__class_init__ as InitializeClass
+from App.Common import package_home
from App.config import getConfiguration
-from Globals import DTMLFile
-from Globals import InitializeClass
-from Globals import package_home
+from App.special_dtml import DTMLFile
from Products.MailHost.interfaces import IMailHost
from Products.MailHost.MailHost import MailHost
from zope.interface import implements
diff --git a/Products/MaildropHost/tests/test_MaildropHost.py b/Products/MaildropHost/tests/test_MaildropHost.py
index a226b94..a7b65cb 100644
--- a/Products/MaildropHost/tests/test_MaildropHost.py
+++ b/Products/MaildropHost/tests/test_MaildropHost.py
@@ -19,7 +19,7 @@ import os
import shutil
import unittest
-from Globals import package_home
+from App.Common import package_home
from Products.MailHost.tests.testMailHost import TestMailHost
from Products.MaildropHost.MaildropHost import MaildropHost