[Zope-Checkins] SVN: Zope/branches/2.12/src/Products/ZCatalog/Catalog.py typo in comment: allways -> always
Log message for revision 114807: typo in comment: allways -> always Changed: U Zope/branches/2.12/src/Products/ZCatalog/Catalog.py -=- Modified: Zope/branches/2.12/src/Products/ZCatalog/Catalog.py === --- Zope/branches/2.12/src/Products/ZCatalog/Catalog.py 2010-07-16 19:23:49 UTC (rev 114806) +++ Zope/branches/2.12/src/Products/ZCatalog/Catalog.py 2010-07-16 22:07:26 UTC (rev 114807) @@ -411,7 +411,7 @@ def recordify(self, object): """ turns an object into a record tuple """ record = [] -# the unique id is allways the first element +# the unique id is always the first element for x in self.names: attr=getattr(object, x, MV) if(attr is not MV and safe_callable(attr)): attr=attr() ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/src/OFS/misc_.py Don't depend on TreeDisplay
Log message for revision 114806:
Don't depend on TreeDisplay
Changed:
U Zope/trunk/src/OFS/misc_.py
-=-
Modified: Zope/trunk/src/OFS/misc_.py
===
--- Zope/trunk/src/OFS/misc_.py 2010-07-16 19:22:05 UTC (rev 114805)
+++ Zope/trunk/src/OFS/misc_.py 2010-07-16 19:23:49 UTC (rev 114806)
@@ -44,10 +44,8 @@
import webdav
davlocked = ImageFile('www/davlock.gif', dirname(webdav.__file__))
-import TreeDisplay
-treedisplay_dir = dirname(TreeDisplay.__file__)
-pl = ImageFile('www/Plus_icon.gif', treedisplay_dir)
-mi = ImageFile('www/Minus_icon.gif', treedisplay_dir)
+pl = ImageFile('www/Plus_icon.gif', ofs_dir)
+mi = ImageFile('www/Minus_icon.gif', ofs_dir)
import App
app_dir = dirname(App.__file__)
___
Zope-Checkins maillist - Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/src/OFS/misc_.py User_icon has moved
Log message for revision 114805:
User_icon has moved
Changed:
U Zope/trunk/src/OFS/misc_.py
-=-
Modified: Zope/trunk/src/OFS/misc_.py
===
--- Zope/trunk/src/OFS/misc_.py 2010-07-16 19:20:41 UTC (rev 114804)
+++ Zope/trunk/src/OFS/misc_.py 2010-07-16 19:22:05 UTC (rev 114805)
@@ -34,8 +34,9 @@
here = dirname(__file__)
broken = ImageFile('www/broken.gif', here)
-import AccessControl
-User_icon = ImageFile('www/User_icon.gif', dirname(AccessControl.__file__))
+import OFS
+ofs_dir = dirname(OFS.__file__)
+User_icon = ImageFile('www/User_icon.gif', ofs_dir)
locked = ImageFile('www/modified.gif', here)
lockedo = ImageFile('www/locked.gif', here)
@@ -56,8 +57,6 @@
r_arrow_gif = ImageFile('www/r_arrow.gif', here)
l_arrow_gif = ImageFile('www/l_arrow.gif', here)
-import OFS
-ofs_dir = dirname(OFS.__file__)
ControlPanel_icon = ImageFile('www/ControlPanel_icon.gif', ofs_dir)
ApplicationManagement_icon = ImageFile('www/cpSystem.gif', app_dir)
DatabaseManagement_icon = ImageFile('www/dbManage.gif', app_dir)
___
Zope-Checkins maillist - Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/ Update to AccessControl = 2.13.2
Log message for revision 114803:
Update to AccessControl = 2.13.2
Changed:
U Zope/trunk/buildout.cfg
U Zope/trunk/doc/CHANGES.rst
U Zope/trunk/setup.py
U Zope/trunk/versions.cfg
-=-
Modified: Zope/trunk/buildout.cfg
===
--- Zope/trunk/buildout.cfg 2010-07-16 19:15:30 UTC (rev 114802)
+++ Zope/trunk/buildout.cfg 2010-07-16 19:16:34 UTC (rev 114803)
@@ -18,8 +18,8 @@
wsgi
sources-dir = develop
auto-checkout =
-AccessControl
+
[test]
recipe = zc.recipe.testrunner
eggs = Zope2
Modified: Zope/trunk/doc/CHANGES.rst
===
--- Zope/trunk/doc/CHANGES.rst 2010-07-16 19:15:30 UTC (rev 114802)
+++ Zope/trunk/doc/CHANGES.rst 2010-07-16 19:16:34 UTC (rev 114803)
@@ -49,8 +49,9 @@
- Updated packages:
+ - AccessControl = 2.13.2
+ - DocumentTemplate = 2.13.1
- ZODB3 = 3.10.0b3
- - DocumentTemplate = 2.13.1
2.13.0a2 (2010-07-13)
-
Modified: Zope/trunk/setup.py
===
--- Zope/trunk/setup.py 2010-07-16 19:15:30 UTC (rev 114802)
+++ Zope/trunk/setup.py 2010-07-16 19:16:34 UTC (rev 114803)
@@ -39,7 +39,7 @@
namespace_packages=['Products', 'Shared', 'Shared.DC'],
package_dir={'': 'src'},
install_requires=[
- 'AccessControl>=2.13.2dev',
+ 'AccessControl>=2.13.2',
'Acquisition',
'DateTime',
'DocumentTemplate',
Modified: Zope/trunk/versions.cfg
===
--- Zope/trunk/versions.cfg 2010-07-16 19:15:30 UTC (rev 114802)
+++ Zope/trunk/versions.cfg 2010-07-16 19:16:34 UTC (rev 114803)
@@ -5,7 +5,7 @@
[versions]
# Zope2-specific
Zope2 =
-AccessControl = 2.13.1
+AccessControl = 2.13.2
Acquisition = 2.13.3
DateTime = 2.12.4
DocumentTemplate = 2.13.1
___
Zope-Checkins maillist - Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/ Updated ZODB3 = 3.10.0b3
Log message for revision 114799: Updated ZODB3 = 3.10.0b3 Changed: U Zope/trunk/doc/CHANGES.rst U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/doc/CHANGES.rst === --- Zope/trunk/doc/CHANGES.rst 2010-07-16 19:07:49 UTC (rev 114798) +++ Zope/trunk/doc/CHANGES.rst 2010-07-16 19:11:29 UTC (rev 114799) @@ -49,7 +49,7 @@ - Updated packages: - - ZODB3 = 3.10.0b2 + - ZODB3 = 3.10.0b3 - DocumentTemplate = 2.13.1 2.13.0a2 (2010-07-13) Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2010-07-16 19:07:49 UTC (rev 114798) +++ Zope/trunk/versions.cfg 2010-07-16 19:11:29 UTC (rev 114799) @@ -30,7 +30,7 @@ ZopeUndo = 2.12.0 # ZTK KGS overrides -ZODB3 = 3.10.0b2 +ZODB3 = 3.10.0b3 # Zope2 dependencies repoze.retry = 0.9.4 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/src/ Merged r114796:114797 from 2.12 branch
Log message for revision 114798:
Merged r114796:114797 from 2.12 branch
Changed:
U Zope/trunk/src/App/ImageFile.py
U Zope/trunk/src/OFS/misc_.py
-=-
Modified: Zope/trunk/src/App/ImageFile.py
===
--- Zope/trunk/src/App/ImageFile.py 2010-07-16 19:03:49 UTC (rev 114797)
+++ Zope/trunk/src/App/ImageFile.py 2010-07-16 19:07:49 UTC (rev 114798)
@@ -32,17 +32,17 @@
import Zope2
PREFIX = os.path.realpath(
-os.path.join(os.path.dirname(Zope2.__file__), os.path.pardir)
-)
+os.path.join(os.path.dirname(Zope2.__file__), os.path.pardir))
NON_PREFIX_WARNING = ('Assuming image location to be present in the Zope2 '
- 'distribution. This is deprecated and might lead to '
- 'broken code if the directory in question is moved '
+ 'distribution. This is deprecated and might lead to '
+ 'broken code if the directory in question is moved '
'to another distribution. Please provide either an '
- 'absolute file system path or a prefix. Support for '
+ 'absolute file system path or a prefix. Support for '
'relative filenames without a prefix might be '
'dropped in a future Zope2 release.')
+
class ImageFile(Explicit):
"""Image objects stored in external files."""
@@ -53,7 +53,7 @@
if _prefix is None:
_prefix=getattr(getConfiguration(), 'softwarehome', None) or PREFIX
if not os.path.isabs(path):
-warnings.warn(NON_PREFIX_WARNING, UserWarning, 2 )
+warnings.warn(NON_PREFIX_WARNING, UserWarning, 2)
elif type(_prefix) is not type(''):
_prefix=package_home(_prefix)
# _prefix is ignored if path is absolute
@@ -82,7 +82,7 @@
self.content_type=content_type
else:
ext = os.path.splitext(path)[-1].replace('.', '')
-self.content_type='image/%s' % ext
+self.content_type = 'image/%s' % ext
self.__name__ = os.path.split(path)[-1]
stat_info = os.stat(path)
@@ -108,8 +108,10 @@
# with common servers such as Apache (which can usually
# understand the screwy date string as a lucky side effect
# of the way they parse it).
-try:mod_since=long(DateTime(header).timeTime())
-except: mod_since=None
+try:
+mod_since = long(DateTime(header).timeTime())
+except:
+mod_since = None
if mod_since is not None:
if getattr(self, 'lmt', None):
last_mod = long(self.lmt)
Modified: Zope/trunk/src/OFS/misc_.py
===
--- Zope/trunk/src/OFS/misc_.py 2010-07-16 19:03:49 UTC (rev 114797)
+++ Zope/trunk/src/OFS/misc_.py 2010-07-16 19:07:49 UTC (rev 114798)
@@ -11,10 +11,13 @@
#
##
+from os.path import dirname
+
from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from App.ImageFile import ImageFile
+
class misc_:
"Miscellaneous product information"
security = ClassSecurityInfo()
@@ -22,51 +25,65 @@
InitializeClass(misc_)
+
class p_:
"Shared system information"
security = ClassSecurityInfo()
security.declareObjectPublic()
-broken=ImageFile('www/broken.gif', globals())
+here = dirname(__file__)
+broken = ImageFile('www/broken.gif', here)
-User_icon =ImageFile('OFS/www/User_icon.gif')
+import AccessControl
+User_icon = ImageFile('www/User_icon.gif', dirname(AccessControl.__file__))
-locked=ImageFile('www/modified.gif', globals())
-lockedo=ImageFile('www/locked.gif', globals())
+locked = ImageFile('www/modified.gif', here)
+lockedo = ImageFile('www/locked.gif', here)
-davlocked=ImageFile('webdav/www/davlock.gif')
+import webdav
+davlocked = ImageFile('www/davlock.gif', dirname(webdav.__file__))
-pl=ImageFile('OFS/www/Plus_icon.gif')
-mi=ImageFile('OFS/www/Minus_icon.gif')
-rtab=ImageFile('App/www/rtab.gif')
-ltab=ImageFile('App/www/ltab.gif')
-sp =ImageFile('App/www/sp.gif')
-r_arrow_gif=ImageFile('www/r_arrow.gif', globals())
-l_arrow_gif=ImageFile('www/l_arrow.gif', globals())
+import TreeDisplay
+treedisplay_dir = dirname(TreeDisplay.__file__)
+pl = ImageFile('www/Plus_icon.gif', treedisplay_dir)
+mi = ImageFile('www/Minus_icon.gif', treedisplay_dir)
-ControlPanel_icon=ImageFile('OFS/www/ControlPanel_icon.gif')
-ApplicationManagement_icon=ImageFile('App/www/cpSystem.gif')
-DatabaseManagement_icon=ImageFile('App/www/dbManage.gif')
-DebugManager_icon=ImageFile('App/www/De
[Zope-Checkins] SVN: Zope/branches/2.12/src/App/ImageFile.py PEP8 cleanup
Log message for revision 114797:
PEP8 cleanup
Changed:
U Zope/branches/2.12/src/App/ImageFile.py
-=-
Modified: Zope/branches/2.12/src/App/ImageFile.py
===
--- Zope/branches/2.12/src/App/ImageFile.py 2010-07-16 19:01:27 UTC (rev
114796)
+++ Zope/branches/2.12/src/App/ImageFile.py 2010-07-16 19:03:49 UTC (rev
114797)
@@ -32,17 +32,17 @@
import Zope2
PREFIX = os.path.realpath(
-os.path.join(os.path.dirname(Zope2.__file__), os.path.pardir)
-)
+os.path.join(os.path.dirname(Zope2.__file__), os.path.pardir))
NON_PREFIX_WARNING = ('Assuming image location to be present in the Zope2 '
- 'distribution. This is deprecated and might lead to '
- 'broken code if the directory in question is moved '
+ 'distribution. This is deprecated and might lead to '
+ 'broken code if the directory in question is moved '
'to another distribution. Please provide either an '
- 'absolute file system path or a prefix. Support for '
+ 'absolute file system path or a prefix. Support for '
'relative filenames without a prefix might be '
'dropped in a future Zope2 release.')
+
class ImageFile(Explicit):
"""Image objects stored in external files."""
@@ -53,7 +53,7 @@
if _prefix is None:
_prefix=getattr(getConfiguration(), 'softwarehome', None) or PREFIX
if not os.path.isabs(path):
-warnings.warn(NON_PREFIX_WARNING, UserWarning, 2 )
+warnings.warn(NON_PREFIX_WARNING, UserWarning, 2)
elif type(_prefix) is not type(''):
_prefix=package_home(_prefix)
# _prefix is ignored if path is absolute
@@ -82,7 +82,7 @@
self.content_type=content_type
else:
ext = os.path.splitext(path)[-1].replace('.', '')
-self.content_type='image/%s' % ext
+self.content_type = 'image/%s' % ext
self.__name__ = os.path.split(path)[-1]
stat_info = os.stat(path)
@@ -108,8 +108,10 @@
# with common servers such as Apache (which can usually
# understand the screwy date string as a lucky side effect
# of the way they parse it).
-try:mod_since=long(DateTime(header).timeTime())
-except: mod_since=None
+try:
+mod_since = long(DateTime(header).timeTime())
+except:
+mod_since = None
if mod_since is not None:
if getattr(self, 'lmt', None):
last_mod = long(self.lmt)
___
Zope-Checkins maillist - Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.12/src/OFS/misc_.py Fixed deprecation warnings in OFS.misc_
Log message for revision 114796:
Fixed deprecation warnings in OFS.misc_
Changed:
U Zope/branches/2.12/src/OFS/misc_.py
-=-
Modified: Zope/branches/2.12/src/OFS/misc_.py
===
--- Zope/branches/2.12/src/OFS/misc_.py 2010-07-16 12:21:19 UTC (rev 114795)
+++ Zope/branches/2.12/src/OFS/misc_.py 2010-07-16 19:01:27 UTC (rev 114796)
@@ -11,10 +11,13 @@
#
##
+from os.path import dirname
+
from AccessControl.SecurityInfo import ClassSecurityInfo
from App.class_init import InitializeClass
from App.ImageFile import ImageFile
+
class misc_:
"Miscellaneous product information"
security = ClassSecurityInfo()
@@ -22,51 +25,65 @@
InitializeClass(misc_)
+
class p_:
"Shared system information"
security = ClassSecurityInfo()
security.declareObjectPublic()
-broken=ImageFile('www/broken.gif', globals())
+here = dirname(__file__)
+broken = ImageFile('www/broken.gif', here)
-User_icon =ImageFile('AccessControl/www/User_icon.gif')
+import AccessControl
+User_icon = ImageFile('www/User_icon.gif', dirname(AccessControl.__file__))
-locked=ImageFile('www/modified.gif', globals())
-lockedo=ImageFile('www/locked.gif', globals())
+locked = ImageFile('www/modified.gif', here)
+lockedo = ImageFile('www/locked.gif', here)
-davlocked=ImageFile('webdav/www/davlock.gif')
+import webdav
+davlocked = ImageFile('www/davlock.gif', dirname(webdav.__file__))
-pl=ImageFile('TreeDisplay/www/Plus_icon.gif')
-mi=ImageFile('TreeDisplay/www/Minus_icon.gif')
-rtab=ImageFile('App/www/rtab.gif')
-ltab=ImageFile('App/www/ltab.gif')
-sp =ImageFile('App/www/sp.gif')
-r_arrow_gif=ImageFile('www/r_arrow.gif', globals())
-l_arrow_gif=ImageFile('www/l_arrow.gif', globals())
+import TreeDisplay
+treedisplay_dir = dirname(TreeDisplay.__file__)
+pl = ImageFile('www/Plus_icon.gif', treedisplay_dir)
+mi = ImageFile('www/Minus_icon.gif', treedisplay_dir)
-ControlPanel_icon=ImageFile('OFS/www/ControlPanel_icon.gif')
-ApplicationManagement_icon=ImageFile('App/www/cpSystem.gif')
-DatabaseManagement_icon=ImageFile('App/www/dbManage.gif')
-DebugManager_icon=ImageFile('App/www/DebugManager_icon.gif')
-InstalledProduct_icon=ImageFile('App/www/installedProduct.gif')
-BrokenProduct_icon=ImageFile('App/www/brokenProduct.gif')
-Product_icon=ImageFile('App/www/product.gif')
-Permission_icon=ImageFile('App/www/permission.gif')
-ProductFolder_icon=ImageFile('App/www/productFolder.gif')
-PyPoweredSmall_Gif=ImageFile('App/www/PythonPoweredSmall.gif')
+import App
+app_dir = dirname(App.__file__)
+rtab = ImageFile('www/rtab.gif', app_dir)
+ltab = ImageFile('www/ltab.gif', app_dir)
+sp = ImageFile('www/sp.gif', app_dir)
+r_arrow_gif = ImageFile('www/r_arrow.gif', here)
+l_arrow_gif = ImageFile('www/l_arrow.gif', here)
-ZopeButton=ImageFile('App/www/zope_button.jpg')
-ZButton=ImageFile('App/www/z_button.jpg')
-zopelogo_jpg=ImageFile('App/www/zopelogo.jpg')
+import OFS
+ofs_dir = dirname(OFS.__file__)
+ControlPanel_icon = ImageFile('www/ControlPanel_icon.gif', ofs_dir)
+ApplicationManagement_icon = ImageFile('www/cpSystem.gif', app_dir)
+DatabaseManagement_icon = ImageFile('www/dbManage.gif', app_dir)
+DebugManager_icon = ImageFile('www/DebugManager_icon.gif', app_dir)
+InstalledProduct_icon = ImageFile('www/installedProduct.gif', app_dir)
+BrokenProduct_icon = ImageFile('www/brokenProduct.gif', app_dir)
+Product_icon = ImageFile('www/product.gif', app_dir)
+Permission_icon = ImageFile('www/permission.gif', app_dir)
+ProductFolder_icon = ImageFile('www/productFolder.gif', app_dir)
+PyPoweredSmall_Gif = ImageFile('www/PythonPoweredSmall.gif', app_dir)
-Properties_icon=ImageFile('OFS/www/Properties_icon.gif')
-Propertysheets_icon=ImageFile('OFS/www/Properties_icon.gif')
+ZopeButton = ImageFile('www/zope_button.jpg', app_dir)
+ZButton = ImageFile('www/z_button.jpg', app_dir)
+zopelogo_jpg = ImageFile('www/zopelogo.jpg', app_dir)
-ProductHelp_icon=ImageFile('HelpSys/images/productHelp.gif')
-HelpTopic_icon=ImageFile('HelpSys/images/helpTopic.gif')
+Properties_icon = ImageFile('www/Properties_icon.gif', ofs_dir)
+Propertysheets_icon = ImageFile('www/Properties_icon.gif', ofs_dir)
+import HelpSys
+helpsys_dir = dirname(HelpSys.__file__)
+ProductHelp_icon=ImageFile('images/productHelp.gif', helpsys_dir)
+HelpTopic_icon=ImageFile('images/helpTopic.gif', helpsys_dir)
+
InitializeClass(p_)
+
class Misc_:
"Miscellaneous product information"
security = ClassSecurityInfo()
___
Zope-Checkins maillist - Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/z
