[Zope-Checkins] SVN: Zope/branches/philikon-local-components/lib/python/zope/ Switch a couple more zope.* packages to Jim's adapter branch

2006-04-04 Thread Philipp von Weitershausen
Log message for revision 66361:
  Switch a couple more zope.* packages to Jim's adapter branch
  Add the ones I factored out of zope.app recently
  

Changed:
  _U  Zope/branches/philikon-local-components/lib/python/zope/

-=-

Property changes on: Zope/branches/philikon-local-components/lib/python/zope
___
Name: svn:externals
   - app  
svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/app
cachedescriptors -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/cachedescriptors
component
svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/component
configuration-r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/configuration
documenttemplate -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/documenttemplate
event-r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/event
exceptions   -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/exceptions
hookable -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/hookable
i18n -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/i18n
i18nmessageid-r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/i18nmessageid
interface
svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/interface
modulealias  -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/modulealias
pagetemplate -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/pagetemplate
proxy-r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/proxy
publisher-r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/publisher
schema   -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/schema
security 
svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/security
server   -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/server
structuredtext   -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/structuredtext
tal  -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/tal
tales-r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/tales
testing  -r 40941 
svn://svn.zope.org/repos/main/zope.testing/trunk/src/zope/testing
thread   -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/thread
deprecation  
svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/deprecation
dottedname   -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/dottedname
formlib  -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/formlib
index-r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/index
testbrowser  -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/testbrowser
deferredimport   
svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/deferredimport

   + app  
svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/app
cachedescriptors -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/cachedescriptors
component
svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/component
configuration-r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/configuration
documenttemplate -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/documenttemplate
event-r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/event
exceptions   -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/exceptions
hookable -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/hookable
i18n 
svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/i18n
i18nmessageid
svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/i18nmessageid
interface
svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/interface
modulealias  -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/modulealias
pagetemplate -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/pagetemplate
proxy
svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/proxy
publisher-r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/publisher
schema   -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/schema
security 
svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/security
server   -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/server
structuredtext   -r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/structuredtext
tal  
svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/tal
tales-r 41215 
svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/tales
testing  -r 40941 
svn://svn.zope.org/repos/main/zope.testing/trunk/src/zope/testing
thread   -r 

[Zope-Checkins] SVN: Zope/branches/philikon-local-components/lib/python/TAL/TALInterpreter.py Only use immutable i18n messages now.

2006-04-04 Thread Philipp von Weitershausen
Log message for revision 66362:
  Only use immutable i18n messages now.
  

Changed:
  U   Zope/branches/philikon-local-components/lib/python/TAL/TALInterpreter.py

-=-
Modified: 
Zope/branches/philikon-local-components/lib/python/TAL/TALInterpreter.py
===
--- Zope/branches/philikon-local-components/lib/python/TAL/TALInterpreter.py
2006-04-04 06:32:59 UTC (rev 66361)
+++ Zope/branches/philikon-local-components/lib/python/TAL/TALInterpreter.py
2006-04-04 06:33:55 UTC (rev 66362)
@@ -24,11 +24,7 @@
 from DocumentTemplate.DT_Util import ustr
 from ZODB.POSException import ConflictError
 
-# BBB 2005/10/10 -- MessageIDs are to be removed for Zope 3.3
-import zope.deprecation
-zope.deprecation.__show__.off()
-from zope.i18nmessageid import Message, MessageID
-zope.deprecation.__show__.on()
+from zope.i18nmessageid import Message
 
 from TALDefs import attrEscape, TAL_VERSION, METALError
 from TALDefs import isCurrentVersion
@@ -36,8 +32,7 @@
 from TALGenerator import TALGenerator
 from TranslationContext import TranslationContext
 
-# This will become (MessageID, Message) when we use Zope 3.1 as a base:
-I18nMessageTypes = Message, MessageID
+I18nMessageTypes = (Message,)
 
 # TODO: In Python 2.4 we can use frozenset() instead of dict.fromkeys()
 BOOLEAN_HTML_ATTRS = dict.fromkeys([

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/i18n.py Only use immutable i18n messages now.

2006-04-04 Thread Philipp von Weitershausen
Log message for revision 66363:
  Only use immutable i18n messages now.
  

Changed:
  U   Products.Five/branches/philikon-local-components/i18n.py

-=-
Modified: Products.Five/branches/philikon-local-components/i18n.py
===
--- Products.Five/branches/philikon-local-components/i18n.py2006-04-04 
06:33:55 UTC (rev 66362)
+++ Products.Five/branches/philikon-local-components/i18n.py2006-04-04 
06:42:48 UTC (rev 66363)
@@ -21,13 +21,8 @@
 from zope.i18n.interfaces import ITranslationDomain, IUserPreferredLanguages
 from zope.component import queryUtility
 from zope.publisher.browser import BrowserLanguages
+from zope.i18nmessageid import Message
 
-# BBB 2005/10/10 -- MessageIDs are to be removed for Zope 3.3
-import zope.deprecation
-zope.deprecation.__show__.off()
-from zope.i18nmessageid import MessageID, Message
-zope.deprecation.__show__.on()
-
 class FiveTranslationService:
 Translation service that delegates to ``zope.i18n`` machinery.
 
@@ -35,7 +30,7 @@
 # regarding fallback and Zope 2 compatability
 def translate(self, domain, msgid, mapping=None,
   context=None, target_language=None, default=None):
-if isinstance(msgid, (Message, MessageID)):
+if isinstance(msgid, Message):
 domain = msgid.domain
 default = msgid.default
 mapping = msgid.mapping

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/branches/philikon-local-components/lib/python/OFS/ObjectManager.py Security declarations for IPossibleSite API.

2006-04-04 Thread Philipp von Weitershausen
Log message for revision 66365:
  Security declarations for IPossibleSite API.
  

Changed:
  U   Zope/branches/philikon-local-components/lib/python/OFS/ObjectManager.py

-=-
Modified: 
Zope/branches/philikon-local-components/lib/python/OFS/ObjectManager.py
===
--- Zope/branches/philikon-local-components/lib/python/OFS/ObjectManager.py 
2006-04-04 06:43:41 UTC (rev 66364)
+++ Zope/branches/philikon-local-components/lib/python/OFS/ObjectManager.py 
2006-04-04 06:50:10 UTC (rev 66365)
@@ -171,11 +171,13 @@
 
 _components = None
 
+security.declarePublic('getSiteManager')
 def getSiteManager(self):
 if self._components is None:
 raise ComponentLookupError('No component registry defined.')
 return self._components
 
+security.declareProtected('Manage Site', 'setSiteManager')
 def setSiteManager(self, components):
 self._components = components
 

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py if it's inefficient, don't do it unless it's used ; -)

2006-04-04 Thread Chris Withers
Log message for revision 66374:
  if it's inefficient, don't do it unless it's used ;-)

Changed:
  U   Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py

-=-
Modified: Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py
===
--- Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py 2006-04-04 10:02:50 UTC 
(rev 66373)
+++ Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py 2006-04-04 10:23:48 UTC 
(rev 66374)
@@ -485,11 +485,10 @@
 name = (name,)
 
 paths = self._catalog.uids.keys()
-num_paths = len(paths)   # inefficient
 
 i = 0
 if pghandler:
-pghandler.init('reindexing %s' % name, num_paths)
+pghandler.init('reindexing %s' % name, len(paths))
 
 for p in paths:
 i+=1

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/branches/2.9/lib/python/Products/ZCatalog/ZCatalog.py if it's inefficient, don't do it unless it's used ; -)

2006-04-04 Thread Chris Withers
Log message for revision 66375:
  if it's inefficient, don't do it unless it's used ;-)

Changed:
  U   Zope/branches/2.9/lib/python/Products/ZCatalog/ZCatalog.py

-=-
Modified: Zope/branches/2.9/lib/python/Products/ZCatalog/ZCatalog.py
===
--- Zope/branches/2.9/lib/python/Products/ZCatalog/ZCatalog.py  2006-04-04 
10:23:48 UTC (rev 66374)
+++ Zope/branches/2.9/lib/python/Products/ZCatalog/ZCatalog.py  2006-04-04 
10:25:23 UTC (rev 66375)
@@ -481,11 +481,10 @@
 name = (name,)
 
 paths = self._catalog.uids.keys()
-num_paths = len(paths)   # inefficient
 
 i = 0
 if pghandler:
-pghandler.init('reindexing %s' % name, num_paths)
+pghandler.init('reindexing %s' % name, len(paths))
 
 for p in paths:
 i+=1

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins