[Zope-Checkins] SVN: Zope/branches/jim-move-Zope/ Deprecated
importing Zope (rather than Zope2).
Jim Fulton
jim at zope.com
Mon Jan 31 07:12:25 EST 2005
Log message for revision 28988:
Deprecated importing Zope (rather than Zope2).
Changed all imports of and references to the Zope to use Zope2 instead.
Changed:
U Zope/branches/jim-move-Zope/lib/python/AccessControl/tests/testUserFolder.py
U Zope/branches/jim-move-Zope/lib/python/App/tests/test_setConfiguration.py
U Zope/branches/jim-move-Zope/lib/python/Interface/pyskel.py
U Zope/branches/jim-move-Zope/lib/python/OFS/tests/testAppInitializer.py
U Zope/branches/jim-move-Zope/lib/python/OFS/tests/testFileAndImage.py
U Zope/branches/jim-move-Zope/lib/python/OFS/tests/testOrderSupport.py
U Zope/branches/jim-move-Zope/lib/python/OFS/tests/testOrderedFolder.py
U Zope/branches/jim-move-Zope/lib/python/OFS/tests/testProductInit.py
U Zope/branches/jim-move-Zope/lib/python/Products/PageTemplates/GlobalTranslationService.py
U Zope/branches/jim-move-Zope/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py
U Zope/branches/jim-move-Zope/lib/python/Products/PluginIndexes/DateIndex/tests/test_DateIndex.py
U Zope/branches/jim-move-Zope/lib/python/Products/PluginIndexes/DateRangeIndex/tests/test_DateRangeIndex.py
U Zope/branches/jim-move-Zope/lib/python/Products/SiteAccess/Extensions/updata.py
U Zope/branches/jim-move-Zope/lib/python/Products/SiteAccess/tests/testVirtualHostMonster.py
U Zope/branches/jim-move-Zope/lib/python/Products/SiteErrorLog/tests/testSiteErrorLog.py
U Zope/branches/jim-move-Zope/lib/python/Products/ZCatalog/regressiontests/loadmail.py
U Zope/branches/jim-move-Zope/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.py
U Zope/branches/jim-move-Zope/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.py
U Zope/branches/jim-move-Zope/lib/python/Products/ZCatalog/regressiontests/regressionUnicode.py
U Zope/branches/jim-move-Zope/lib/python/Products/ZCatalog/tests/testCatalog.py
U Zope/branches/jim-move-Zope/lib/python/Products/ZODBMountPoint/tests/testMountPoint.py
U Zope/branches/jim-move-Zope/lib/python/TAL/DummyEngine.py
U Zope/branches/jim-move-Zope/lib/python/Testing/ZopeTestCase/ZopeLite.py
U Zope/branches/jim-move-Zope/lib/python/Testing/ZopeTestCase/__init__.py
U Zope/branches/jim-move-Zope/lib/python/Testing/ZopeTestCase/base.py
U Zope/branches/jim-move-Zope/lib/python/Testing/ZopeTestCase/sandbox.py
U Zope/branches/jim-move-Zope/lib/python/Testing/makerequest.py
U Zope/branches/jim-move-Zope/lib/python/ZEO/util.py
U Zope/branches/jim-move-Zope/lib/python/ZODB/DemoStorage.py
U Zope/branches/jim-move-Zope/lib/python/ZPublisher/tests/testPostTraversal.py
U Zope/branches/jim-move-Zope/lib/python/ZPublisher/tests/testPublish.py
U Zope/branches/jim-move-Zope/lib/python/Zope.py
U Zope/branches/jim-move-Zope/lib/python/Zope2/Startup/tests/testStarter.py
U Zope/branches/jim-move-Zope/lib/python/Zope2/Startup/warnfilter.xml
U Zope/branches/jim-move-Zope/lib/python/Zope2/Startup/zopeschema.xml
U Zope/branches/jim-move-Zope/lib/python/ZopeUndo/Prefix.py
U Zope/branches/jim-move-Zope/setup.py
U Zope/branches/jim-move-Zope/skel/bin/runzope.in
U Zope/branches/jim-move-Zope/skel/bin/zopectl.in
U Zope/branches/jim-move-Zope/test.py
U Zope/branches/jim-move-Zope/utilities/ZODBTools/zodbload.py
U Zope/branches/jim-move-Zope/utilities/check_catalog.py
-=-
Modified: Zope/branches/jim-move-Zope/lib/python/AccessControl/tests/testUserFolder.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/AccessControl/tests/testUserFolder.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/AccessControl/tests/testUserFolder.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -22,8 +22,8 @@
import transaction
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from AccessControl import Unauthorized
from AccessControl.SecurityManagement import newSecurityManager
@@ -36,7 +36,7 @@
def setUp(self):
transaction.begin()
- self.app = makerequest(Zope.app())
+ self.app = makerequest(Zope2.app())
try:
# Set up a user and role
self.uf = UserFolder().__of__(self.app)
Modified: Zope/branches/jim-move-Zope/lib/python/App/tests/test_setConfiguration.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/App/tests/test_setConfiguration.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/App/tests/test_setConfiguration.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -17,8 +17,8 @@
import os, sys, unittest
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
import App.config
import App.FindHomes
Modified: Zope/branches/jim-move-Zope/lib/python/Interface/pyskel.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Interface/pyskel.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Interface/pyskel.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -20,7 +20,7 @@
Example:
cd lib/python
- python Interface/pyskel.py Zope.App.Security.IRoleService.IRoleService
+ python Interface/pyskel.py Zope2.App.Security.IRoleService.IRoleService
The dotted name is the module name and interface object name connected
with a dot.
Modified: Zope/branches/jim-move-Zope/lib/python/OFS/tests/testAppInitializer.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/OFS/tests/testAppInitializer.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/OFS/tests/testAppInitializer.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -16,7 +16,7 @@
import ZODB
from OFS.Application import Application, AppInitializer, get_products
-import Zope.Startup
+import Zope2.Startup
import ZConfig
from App.config import getConfiguration, setConfiguration
@@ -46,7 +46,7 @@
"""
def getSchema():
- startup = os.path.dirname(os.path.realpath(Zope.Startup.__file__))
+ startup = os.path.dirname(os.path.realpath(Zope2.Startup.__file__))
schemafile = os.path.join(startup, 'zopeschema.xml')
return ZConfig.loadSchema(schemafile)
Modified: Zope/branches/jim-move-Zope/lib/python/OFS/tests/testFileAndImage.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/OFS/tests/testFileAndImage.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/OFS/tests/testFileAndImage.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -1,6 +1,6 @@
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
import os, sys
import unittest
Modified: Zope/branches/jim-move-Zope/lib/python/OFS/tests/testOrderSupport.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/OFS/tests/testOrderSupport.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/OFS/tests/testOrderSupport.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -1,8 +1,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Interface.Verify import verifyClass
from OFS.CopySupport import CopySource
Modified: Zope/branches/jim-move-Zope/lib/python/OFS/tests/testOrderedFolder.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/OFS/tests/testOrderedFolder.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/OFS/tests/testOrderedFolder.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -1,8 +1,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Interface.Verify import verifyClass
from OFS.OrderedFolder import OrderedFolder
Modified: Zope/branches/jim-move-Zope/lib/python/OFS/tests/testProductInit.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/OFS/tests/testProductInit.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/OFS/tests/testProductInit.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -16,7 +16,7 @@
import ZODB
from OFS.Application import Application, AppInitializer, get_products
-import Zope.Startup
+import Zope2.Startup
import ZConfig
from App.config import getConfiguration, setConfiguration
@@ -56,7 +56,7 @@
"""
def getSchema():
- startup = os.path.dirname(os.path.realpath(Zope.Startup.__file__))
+ startup = os.path.dirname(os.path.realpath(Zope2.Startup.__file__))
schemafile = os.path.join(startup, 'zopeschema.xml')
return ZConfig.loadSchema(schemafile)
@@ -95,7 +95,7 @@
text = text.replace("<<PRODUCTS2>>", TEMPPRODUCTS2)
sio = cStringIO.StringIO(text)
conf, handler = ZConfig.loadConfigFile(schema, sio)
- from Zope.Startup.handlers import handleConfig
+ from Zope2.Startup.handlers import handleConfig
handleConfig(conf, handler)
self.assertEqual(conf.instancehome, TEMPNAME)
setConfiguration(conf)
Modified: Zope/branches/jim-move-Zope/lib/python/Products/PageTemplates/GlobalTranslationService.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Products/PageTemplates/GlobalTranslationService.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Products/PageTemplates/GlobalTranslationService.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -29,7 +29,7 @@
return ustr(mapping[m.group(m.lastindex)])
cre = re.compile(r'\$(?:(%s)|\{(%s)\})' % (NAME_RE, NAME_RE))
return cre.sub(repl, default or msgid)
- # XXX Not all of Zope.I18n.ITranslationService is implemented.
+ # XXX Not all of Zope2.I18n.ITranslationService is implemented.
translationService = DummyTranslationService()
Modified: Zope/branches/jim-move-Zope/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -8,7 +8,7 @@
import unittest
-import Zope
+import Zope2
import transaction
from Testing.makerequest import makerequest
@@ -17,7 +17,7 @@
def setUp(self):
transaction.begin()
- self.app = makerequest(Zope.app())
+ self.app = makerequest(Zope2.app())
f = self.app.manage_addProduct['PageTemplates'].manage_addPageTemplate
self._addPT = f
self.title = 'title of page template'
Modified: Zope/branches/jim-move-Zope/lib/python/Products/PluginIndexes/DateIndex/tests/test_DateIndex.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Products/PluginIndexes/DateIndex/tests/test_DateIndex.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Products/PluginIndexes/DateIndex/tests/test_DateIndex.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -11,7 +11,7 @@
#
##############################################################################
-import Zope
+import Zope2
import unittest
from DateTime import DateTime
Modified: Zope/branches/jim-move-Zope/lib/python/Products/PluginIndexes/DateRangeIndex/tests/test_DateRangeIndex.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Products/PluginIndexes/DateRangeIndex/tests/test_DateRangeIndex.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Products/PluginIndexes/DateRangeIndex/tests/test_DateRangeIndex.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -11,7 +11,7 @@
#
##############################################################################
-import Zope
+import Zope2
import unittest
import sys
Modified: Zope/branches/jim-move-Zope/lib/python/Products/SiteAccess/Extensions/updata.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Products/SiteAccess/Extensions/updata.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Products/SiteAccess/Extensions/updata.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -1,4 +1,4 @@
-import Zope
+import Zope2
from ZPublisher.BeforeTraverse import NameCaller, rewriteBeforeTraverse
from Products.SiteAccess.AccessRule import AccessRule
@@ -31,7 +31,7 @@
if __name__ == '__main__':
print "Converting SiteAccess objects from 1.x to 2.x ..."
- app = Zope.app()
+ app = Zope2.app()
_cvt_btr(app)
get_transaction().commit()
print "Done."
Modified: Zope/branches/jim-move-Zope/lib/python/Products/SiteAccess/tests/testVirtualHostMonster.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Products/SiteAccess/tests/testVirtualHostMonster.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Products/SiteAccess/tests/testVirtualHostMonster.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -12,8 +12,8 @@
from Testing.makerequest import makerequest
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
import transaction
@@ -24,7 +24,7 @@
def setUp(self):
transaction.begin()
- self.app = makerequest(Zope.app())
+ self.app = makerequest(Zope2.app())
try:
#self.app.manage_addProduct['SiteAccess'].manage_addVirtualHostMonster('VHM')
# now we have a VHM as virtual_hosting per default
Modified: Zope/branches/jim-move-Zope/lib/python/Products/SiteErrorLog/tests/testSiteErrorLog.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Products/SiteErrorLog/tests/testSiteErrorLog.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Products/SiteErrorLog/tests/testSiteErrorLog.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -7,8 +7,8 @@
from Testing.makerequest import makerequest
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
import transaction
@@ -20,7 +20,7 @@
def setUp(self):
transaction.begin()
- self.app = makerequest(Zope.app())
+ self.app = makerequest(Zope2.app())
try:
self.app.manage_addDTMLMethod('doc', '')
except:
Modified: Zope/branches/jim-move-Zope/lib/python/Products/ZCatalog/regressiontests/loadmail.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Products/ZCatalog/regressiontests/loadmail.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Products/ZCatalog/regressiontests/loadmail.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -207,7 +207,7 @@
from ZODB.POSException import ConflictError
from time import sleep
from whrandom import uniform
- import Zope, sys
+ import Zope2, sys
rconflicts=wconflicts=0
i=0
@@ -218,7 +218,7 @@
# sys.stderr.write("%s " % i)
# sys.stdout.flush()
if wait: sleep(uniform(0,wait))
- jar=Zope.DB.open()
+ jar=Zope2.DB.open()
app=jar.root()['Application']
mdest=getattr(app, name)
if i%100 == 0 and VERBOSE:
@@ -260,14 +260,14 @@
def base():
try: os.unlink('../../var/Data.fs')
except: pass
- import Zope
- app=Zope.app()
+ import Zope2
+ app=Zope2.app()
if len(sys.argv) > 3:
max = atoi(sys.argv[3])
else:
max = -1
- print do(Zope.DB, loadmail, (app, 'mail', sys.argv[2], max))
- Zope.DB.close()
+ print do(Zope2.DB, loadmail, (app, 'mail', sys.argv[2], max))
+ Zope2.DB.close()
class RE:
def redirect(*args, **kw): pass
@@ -281,9 +281,9 @@
def index():
os.environ['STUPID_LOG_FILE']=''
os.environ['STUPID_LOG_SEVERITY']='-111'
- import Zope, Products.ZCatalog.ZCatalog
+ import Zope2, Products.ZCatalog.ZCatalog
import AccessControl.SecurityManagement, AccessControl.SpecialUsers
- app=Zope.app()
+ app=Zope2.app()
Products.ZCatalog.ZCatalog.manage_addZCatalog(app, 'cat', '')
try:
app.cat.threshold = atoi(sys.argv[2])
@@ -311,13 +311,13 @@
AccessControl.SecurityManagement.newSecurityManager(None, system)
r=RE()
r.PARENTS=[app.cat, app]
- print do(Zope.DB, indexf, (app,))
+ print do(Zope2.DB, indexf, (app,))
#hist(sys.argv[2])
- Zope.DB.close()
+ Zope2.DB.close()
def initmaili(n):
- import Zope
- app=Zope.app()
+ import Zope2
+ app=Zope2.app()
try:
import Products.BTreeFolder.BTreeFolder
except:
@@ -329,8 +329,8 @@
app._p_jar.close()
def hist(n):
- import Zope
- app=Zope.app()
+ import Zope2
+ app=Zope2.app()
import cPickle
pickler=cPickle.Pickler(open("h%s.hist" % n, 'w'))
h=app.cat._catalog.indexes['PrincipiaSearchSource'].histogram()
@@ -339,7 +339,7 @@
#pickler.dump(list(h))
def inc():
- import Zope, thread
+ import Zope2, thread
min, max = atoi(sys.argv[3]), atoi(sys.argv[4])
count = max-min
try: threads=atoi(sys.argv[5])
@@ -356,7 +356,7 @@
omin=min
- db=Zope.DB
+ db=Zope2.DB
size=db.getSize()
mem=VmSize()
@@ -383,7 +383,7 @@
argss.append((lock, (dest, mb, f, count, wait), returnf))
for lock, args, returnf in argss:
- thread.start_new_thread(do, (Zope.DB, loadinc, args, returnf))
+ thread.start_new_thread(do, (Zope2.DB, loadinc, args, returnf))
for lock, args, returnf in argss:
lock.acquire()
@@ -397,12 +397,12 @@
#hist("%s-%s-%s" % (omin, count, threads))
- Zope.DB.close()
+ Zope2.DB.close()
def catdel():
- import Zope
- app = Zope.app()
- db = Zope.DB
+ import Zope2
+ app = Zope2.app()
+ db = Zope2.DB
t = time.time()
c = time.clock()
size = db.getSize()
@@ -605,14 +605,14 @@
from ZODB.utils import u64
def incedit(edits, wait, ndel=20, nins=20):
- import Zope, whrandom, string, time
+ import Zope2, whrandom, string, time
from ZODB.POSException import ConflictError
rconflicts=wconflicts=0
did=str(edits.pop())
while edits:
if wait: time.sleep(whrandom.uniform(0,wait))
- jar=Zope.DB.open()
+ jar=Zope2.DB.open()
app=jar.root()['Application']
doc=getattr(app.mail, did)
@@ -650,7 +650,7 @@
return rconflicts, wconflicts
def edit():
- import Zope, thread
+ import Zope2, thread
nedit, ndel, nins = atoi(sys.argv[2]), atoi(sys.argv[3]), atoi(sys.argv[4])
try: threads=atoi(sys.argv[5])
except:
@@ -664,8 +664,8 @@
if threads==1: start_new_thread=apply
else: start_new_thread=thread.start_new_thread
- db=Zope.DB
- app=Zope.app()
+ db=Zope2.DB
+ app=Zope2.app()
number_of_messages=app.mail.number_of_messages
app._p_jar.close()
@@ -696,7 +696,7 @@
argss.append((lock, (edits, wait, ndel, nins), returnf))
for lock, args, returnf in argss:
- start_new_thread(do, (Zope.DB, incedit, args, returnf))
+ start_new_thread(do, (Zope2.DB, incedit, args, returnf))
for lock, args, returnf in argss:
lock.acquire()
@@ -710,7 +710,7 @@
#hist("e%s" % (threads))
- Zope.DB.close()
+ Zope2.DB.close()
def VmSize():
try: f=open('/proc/%s/status' % os.getpid())
Modified: Zope/branches/jim-move-Zope/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -16,7 +16,7 @@
here = os.getcwd()
-import Zope
+import Zope2
import ZODB, ZODB.FileStorage
from Products.ZCatalog import ZCatalog,Vocabulary
from Products.ZCatalog.Catalog import CatalogError
Modified: Zope/branches/jim-move-Zope/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -17,7 +17,7 @@
'debug.log')
here = os.getcwd()
-import Zope
+import Zope2
import mailbox, time, httplib
from string import strip, find, split, lower, atoi, join
from urllib import quote
@@ -36,7 +36,7 @@
class TestTimeIndex(TestCase):
def setUp(self):
- self.app = makerequest(Zope.app())
+ self.app = makerequest(Zope2.app())
try: self.app._delObject('catalogtest')
except AttributeError: pass
self.app.manage_addFolder('catalogtest')
Modified: Zope/branches/jim-move-Zope/lib/python/Products/ZCatalog/regressiontests/regressionUnicode.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Products/ZCatalog/regressiontests/regressionUnicode.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Products/ZCatalog/regressiontests/regressionUnicode.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -1,7 +1,7 @@
import os,sys
import unittest
-import Zope
+import Zope2
from Products.ZCatalog.ZCatalog import ZCatalog
from Products.PluginIndexes.TextIndex import Splitter
Modified: Zope/branches/jim-move-Zope/lib/python/Products/ZCatalog/tests/testCatalog.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Products/ZCatalog/tests/testCatalog.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Products/ZCatalog/tests/testCatalog.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -17,8 +17,8 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Interface.Verify import verifyClass
from itertools import chain
Modified: Zope/branches/jim-move-Zope/lib/python/Products/ZODBMountPoint/tests/testMountPoint.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Products/ZODBMountPoint/tests/testMountPoint.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Products/ZODBMountPoint/tests/testMountPoint.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -38,7 +38,7 @@
def getDB(self):
from ZODB.config import DemoStorage
from ZODB.Connection import Connection
- from Zope.Startup.datatypes import ZopeDatabase
+ from Zope2.Startup.datatypes import ZopeDatabase
self.name = self.fname
self.base = None
self.path = os.path.join(os.path.dirname(__file__), self.fname)
Modified: Zope/branches/jim-move-Zope/lib/python/TAL/DummyEngine.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/TAL/DummyEngine.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/TAL/DummyEngine.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -24,8 +24,8 @@
IDomain = None
try:
- from Zope.I18n.ITranslationService import ITranslationService
- from Zope.I18n.IDomain import IDomain
+ from Zope2.I18n.ITranslationService import ITranslationService
+ from Zope2.I18n.IDomain import IDomain
except ImportError:
pass
if IDomain is None:
Modified: Zope/branches/jim-move-Zope/lib/python/Testing/ZopeTestCase/ZopeLite.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Testing/ZopeTestCase/ZopeLite.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Testing/ZopeTestCase/ZopeLite.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -7,9 +7,9 @@
#
# Typically used as in
#
-# import ZopeLite as Zope
-# Zope.installProduct('SomeProduct')
-# app = Zope.app()
+# import ZopeLite as Zope2
+# Zope2.installProduct('SomeProduct')
+# app = Zope2.app()
#
# $Id: ZopeLite.py,v 1.24 2004/08/18 09:28:54 shh42 Exp $
@@ -53,10 +53,10 @@
config.debug_mode = 0
App.config.setConfiguration(config)
-# Need to import Zope early on as the
+# Need to import Zope2 early on as the
# ZTUtils package relies on it
-_exec('import Zope')
-import Zope
+_exec('import Zope2')
+import Zope2
_exec('import ZODB')
import ZODB
_write('.')
@@ -96,7 +96,7 @@
from OFS.Folder import Folder
import Products
-_theApp = Zope.app()
+_theApp = Zope2.app()
_installedProducts = {}
def hasProduct(name):
@@ -144,16 +144,16 @@
#installProduct('MailHost', 1)
# So people can use ZopeLite.app()
-app = Zope.app
-debug = Zope.debug
-DB = Zope.DB
-configure = Zope.configure
+app = Zope2.app
+debug = Zope2.debug
+DB = Zope2.DB
+configure = Zope2.configure
def startup(): pass
from ZODB.DemoStorage import DemoStorage
def sandbox(base=None):
'''Returns what amounts to a sandbox copy of the base ZODB.'''
- if base is None: base = Zope.DB
+ if base is None: base = Zope2.DB
base_storage = base._storage
quota = getattr(base_storage, '_quota', None)
storage = DemoStorage(base=base_storage, quota=quota)
Modified: Zope/branches/jim-move-Zope/lib/python/Testing/ZopeTestCase/__init__.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Testing/ZopeTestCase/__init__.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Testing/ZopeTestCase/__init__.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -4,7 +4,7 @@
# $Id: __init__.py,v 1.13 2004/08/19 15:52:55 shh42 Exp $
-import ZopeLite as Zope
+import ZopeLite as Zope2
import utils
from ZopeLite import installProduct
Modified: Zope/branches/jim-move-Zope/lib/python/Testing/ZopeTestCase/base.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Testing/ZopeTestCase/base.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Testing/ZopeTestCase/base.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -4,7 +4,7 @@
# $Id: base.py,v 1.1 2004/08/19 13:59:41 shh42 Exp $
-import ZopeLite as Zope
+import ZopeLite as Zope2
import unittest
import transaction
@@ -19,7 +19,7 @@
def app():
'''Opens a ZODB connection and returns the app object.'''
- app = Zope.app()
+ app = Zope2.app()
_connections.register(app._p_jar)
return utils.makerequest(app)
Modified: Zope/branches/jim-move-Zope/lib/python/Testing/ZopeTestCase/sandbox.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Testing/ZopeTestCase/sandbox.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Testing/ZopeTestCase/sandbox.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -4,7 +4,7 @@
# $Id: sandbox.py,v 1.2 2004/08/19 15:31:26 shh42 Exp $
-import ZopeLite as Zope
+import ZopeLite as Zope2
import transaction
import utils
@@ -19,7 +19,7 @@
def _app(self):
'''Returns the app object for a test.'''
- app = Zope.app(Zope.sandbox().open())
+ app = Zope2.app(Zope.sandbox().open())
AppZapper().set(app)
return utils.makerequest(app)
Modified: Zope/branches/jim-move-Zope/lib/python/Testing/makerequest.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Testing/makerequest.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Testing/makerequest.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -17,7 +17,7 @@
Usage:
import makerequest
- app = makerequest.makerequest(Zope.app())
+ app = makerequest.makerequest(Zope2.app())
$Id$
Modified: Zope/branches/jim-move-Zope/lib/python/ZEO/util.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/ZEO/util.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/ZEO/util.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -37,7 +37,7 @@
v = os.environ.get("INSTANCE_HOME")
if v is None:
# looking for a Zope/var directory assuming that this code
- # is installed in Zope/lib/python/ZEO
+ # is installed in Zope2/lib/python/ZEO
p = parentdir(argv0, 4)
if os.path.isdir(os.path.join(p, "var")):
v = p
Modified: Zope/branches/jim-move-Zope/lib/python/ZODB/DemoStorage.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/ZODB/DemoStorage.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/ZODB/DemoStorage.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -69,12 +69,12 @@
as changes are made. For example, in Zope, you can create an external
method::
- import Zope
+ import Zope2
def info(RESPONSE):
RESPONSE['Content-type']= 'text/plain'
- return Zope.DB._storage._splat()
+ return Zope2.DB._storage._splat()
and call it to monitor the storage.
Modified: Zope/branches/jim-move-Zope/lib/python/ZPublisher/tests/testPostTraversal.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/ZPublisher/tests/testPostTraversal.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/ZPublisher/tests/testPostTraversal.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -1,7 +1,7 @@
from unittest import TestCase, TestSuite, makeSuite, main
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Acquisition import Implicit
from ZPublisher.BaseRequest import BaseRequest
Modified: Zope/branches/jim-move-Zope/lib/python/ZPublisher/tests/testPublish.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/ZPublisher/tests/testPublish.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/ZPublisher/tests/testPublish.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -35,7 +35,7 @@
class TransactionsManager:
"""Mock TransactionManager to replace
- Zope.App.startup.TransactionsManager.
+ Zope2.App.startup.TransactionsManager.
"""
def abort(self):
@@ -55,7 +55,7 @@
def zpublisher_exception_hook(published, request, t, v, traceback):
"""Mock zpublisher_exception_hook to replace
- Zope.App.startup.zpublisher_exception_hook
+ Zope2.App.startup.zpublisher_exception_hook
"""
if issubclass(t, ConflictError):
Modified: Zope/branches/jim-move-Zope/lib/python/Zope.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Zope.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Zope.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -18,3 +18,10 @@
import sys, Zope2
sys.modules['Zope'] = Zope2
+
+import warnings
+warnings.warn("The Zope package has been renamed to Zope2.\n"
+ "Import of a package named 'Zope' is deprecated\n"
+ "and will be disabled starting in Zope 2.10.\n"
+ ,
+ DeprecationWarning, stacklevel=2)
Modified: Zope/branches/jim-move-Zope/lib/python/Zope2/Startup/tests/testStarter.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Zope2/Startup/tests/testStarter.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Zope2/Startup/tests/testStarter.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -385,7 +385,7 @@
sys.argv = [sys.argv[0]]
try:
fname = os.path.join(TEMPNAME, 'zope.conf')
- from Zope import configure
+ from Zope2 import configure
f = open(fname, 'w')
f.write('instancehome %s\nzserver-threads 100\n' % TEMPNAME)
f.flush()
Modified: Zope/branches/jim-move-Zope/lib/python/Zope2/Startup/warnfilter.xml
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Zope2/Startup/warnfilter.xml 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Zope2/Startup/warnfilter.xml 2005-01-31 12:12:24 UTC (rev 28988)
@@ -1,4 +1,4 @@
-<component prefix="Zope.Startup.warnfilter">
+<component prefix="Zope2.Startup.warnfilter">
<sectiontype name="warnfilter" datatype=".warning_filter_handler">
<key name="action" datatype=".warn_action" default="default"/>
<key name="message" default=""/>
Modified: Zope/branches/jim-move-Zope/lib/python/Zope2/Startup/zopeschema.xml
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Zope2/Startup/zopeschema.xml 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/Zope2/Startup/zopeschema.xml 2005-01-31 12:12:24 UTC (rev 28988)
@@ -1,4 +1,4 @@
-<schema prefix="Zope.Startup.datatypes"
+<schema prefix="Zope2.Startup.datatypes"
datatype=".root_config"
handler="root_handler">
@@ -9,7 +9,7 @@
<import package="ZODB"/>
<import package="ZServer"/>
<import package="tempstorage"/>
- <import package="Zope.Startup" file="warnfilter.xml"/>
+ <import package="Zope2.Startup" file="warnfilter.xml"/>
<sectiontype name="logger" datatype=".LoggerFactory">
<description>
Modified: Zope/branches/jim-move-Zope/lib/python/ZopeUndo/Prefix.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/ZopeUndo/Prefix.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/lib/python/ZopeUndo/Prefix.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
-"""ZODB undo support for Zope.
+"""ZODB undo support for Zope2.
This package is used to support the Prefix object that Zope uses for
undo. It is a separate package only to aid configuration management.
Modified: Zope/branches/jim-move-Zope/setup.py
===================================================================
--- Zope/branches/jim-move-Zope/setup.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/setup.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -605,9 +605,9 @@
name='Zope',
author=AUTHOR,
- packages=['Zope', 'Zope.App', 'Zope.Startup', 'Zope.Startup.misc',
- 'Zope.Startup.nt', 'Zope.Startup.tests'],
- data_files=[ ['Zope/Startup', ['Zope/Startup/*.xml']] ],
+ packages=['Zope2', 'Zope2.App', 'Zope2.Startup', 'Zope2.Startup.misc',
+ 'Zope2.Startup.nt', 'Zope2.Startup.tests'],
+ data_files=[ ['Zope2/Startup', ['Zope2/Startup/*.xml']] ],
)
# webdav
Modified: Zope/branches/jim-move-Zope/skel/bin/runzope.in
===================================================================
--- Zope/branches/jim-move-Zope/skel/bin/runzope.in 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/skel/bin/runzope.in 2005-01-31 12:12:24 UTC (rev 28988)
@@ -8,6 +8,6 @@
PYTHONPATH="$SOFTWARE_HOME"
export PYTHONPATH INSTANCE_HOME SOFTWARE_HOME
-ZOPE_RUN="$SOFTWARE_HOME/Zope/Startup/run.py"
+ZOPE_RUN="$SOFTWARE_HOME/Zope2/Startup/run.py"
exec "$PYTHON" "$ZOPE_RUN" -C "$CONFIG_FILE" "$@"
Modified: Zope/branches/jim-move-Zope/skel/bin/zopectl.in
===================================================================
--- Zope/branches/jim-move-Zope/skel/bin/zopectl.in 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/skel/bin/zopectl.in 2005-01-31 12:12:24 UTC (rev 28988)
@@ -8,6 +8,6 @@
PYTHONPATH="$SOFTWARE_HOME"
export PYTHONPATH INSTANCE_HOME SOFTWARE_HOME
-ZDCTL="$SOFTWARE_HOME/Zope/Startup/zopectl.py"
+ZDCTL="$SOFTWARE_HOME/Zope2/Startup/zopectl.py"
exec "$PYTHON" "$ZDCTL" -C "$CONFIG_FILE" "$@"
Modified: Zope/branches/jim-move-Zope/test.py
===================================================================
--- Zope/branches/jim-move-Zope/test.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/test.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -661,8 +661,8 @@
if config_file:
config_file = os.path.realpath(config_file)
print "Parsing %s" % config_file
- import Zope
- Zope.configure(config_file)
+ import Zope2
+ Zope2.configure(config_file)
if not keepStaleBytecode:
from App.config import getConfiguration
Modified: Zope/branches/jim-move-Zope/utilities/ZODBTools/zodbload.py
===================================================================
--- Zope/branches/jim-move-Zope/utilities/ZODBTools/zodbload.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/utilities/ZODBTools/zodbload.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -197,10 +197,10 @@
os.remove(os.path.join(lib_python, '..', '..', 'var', 'Data.fs'))
except:
pass
- import Zope
+ import Zope2
import Products
import AccessControl.SecurityManagement
- app=Zope.app()
+ app=Zope2.app()
Products.ZCatalog.ZCatalog.manage_addZCatalog(app, 'cat', '')
@@ -279,16 +279,16 @@
factory.__name__, r)
def run(jobs, tid=''):
- import Zope
+ import Zope2
while 1:
factory, job, args, repeatp = jobs.next()
- run1(tid, Zope.DB, factory, job, args)
+ run1(tid, Zope2.DB, factory, job, args)
if repeatp:
while 1:
i = random.randint(0,100)
if i > repeatp:
break
- run1(tid, Zope.DB, factory, job, args)
+ run1(tid, Zope2.DB, factory, job, args)
def index(connection, messages, catalog):
@@ -733,8 +733,8 @@
if options.has_key('setup'):
setup(lib_python)
else:
- import Zope
- Zope.startup()
+ import Zope2
+ Zope2.startup()
#from ThreadedAsync.LoopCallback import loop
#threading.Thread(target=loop, args=(), name='asyncore').start()
Modified: Zope/branches/jim-move-Zope/utilities/check_catalog.py
===================================================================
--- Zope/branches/jim-move-Zope/utilities/check_catalog.py 2005-01-31 09:41:27 UTC (rev 28987)
+++ Zope/branches/jim-move-Zope/utilities/check_catalog.py 2005-01-31 12:12:24 UTC (rev 28988)
@@ -15,7 +15,7 @@
$Id$
"""
-import Zope
+import Zope2
import os,sys,re,getopt
from types import IntType
from BTrees.IIBTree import IISet,difference,intersection
@@ -23,7 +23,7 @@
def checkCatalog(path,indexes):
""" perform some consistency checks on a ZCatalog instance"""
- root = Zope.app()
+ root = Zope2.app()
try:
catalog = root.unrestrictedTraverse(path)
More information about the Zope-Checkins
mailing list