[Zope-Checkins] SVN: Zope/branches/gsoc-python-2.5/lib/python/zope/app/ - Update some externals to trunk versions
Log message for revision 92148: - Update some externals to trunk versions Changed: _U Zope/branches/gsoc-python-2.5/lib/python/zope/app/ -=- Property changes on: Zope/branches/gsoc-python-2.5/lib/python/zope/app ___ Name: svn:externals - annotation svn://svn.zope.org/repos/main/zope.app.annotation/tags/3.4.0/src/zope/app/annotation apidoc svn://svn.zope.org/repos/main/zope.app.apidoc/tags/3.4.3/src/zope/app/apidoc applicationcontrol svn://svn.zope.org/repos/main/zope.app.applicationcontrol/tags/3.4.1/src/zope/app/applicationcontrol appsetup svn://svn.zope.org/repos/main/zope.app.appsetup/tags/3.4.1/src/zope/app/appsetup authentication svn://svn.zope.org/repos/main/zope.app.authentication/tags/3.4.1/src/zope/app/authentication basicskin svn://svn.zope.org/repos/main/zope.app.basicskin/tags/3.4.0/src/zope/app/basicskin broken svn://svn.zope.org/repos/main/zope.app.broken/tags/3.4.0/src/zope/app/broken cache svn://svn.zope.org/repos/main/zope.app.cache/tags/3.4.0/src/zope/app/cache component svn://svn.zope.org/repos/main/zope.app.component/branches/sidnei-back35-quick-hack/src/zope/app/component container svn://svn.zope.org/repos/main/zope.app.container/tags/3.5.3/src/zope/app/container content svn://svn.zope.org/repos/main/zope.app.content/tags/3.4.0/src/zope/app/content debug svn://svn.zope.org/repos/main/zope.app.debug/tags/3.4.0/src/zope/app/debug dependable svn://svn.zope.org/repos/main/zope.app.dependable/tags/3.4.0/src/zope/app/dependable error svn://svn.zope.org/repos/main/zope.app.error/tags/3.5.1/src/zope/app/error exception svn://svn.zope.org/repos/main/zope.app.exception/tags/3.4.1/src/zope/app/exception file svn://svn.zope.org/repos/main/zope.app.file/tags/3.4.2/src/zope/app/file folder svn://svn.zope.org/repos/main/zope.app.folder/tags/3.4.0/src/zope/app/folder form svn://svn.zope.org/repos/main/zope.app.form/tags/3.4.1/src/zope/app/form generations svn://svn.zope.org/repos/main/zope.app.generations/tags/3.4.1/src/zope/app/generations http svn://svn.zope.org/repos/main/zope.app.http/tags/3.4.1/src/zope/app/http i18n svn://svn.zope.org/repos/main/zope.app.i18n/tags/3.4.4/src/zope/app/i18n interface svn://svn.zope.org/repos/main/zope.app.interface/tags/3.4.0/src/zope/app/interface intid svn://svn.zope.org/repos/main/zope.app.intid/tags/3.4.1/src/zope/app/intid keyreference svn://svn.zope.org/repos/main/zope.app.keyreference/tags/3.4.1/src/zope/app/keyreference layers svn://svn.zope.org/repos/main/zope.app.layers/tags/3.4.0/src/zope/app/layers locales svn://svn.zope.org/repos/main/zope.app.locales/tags/3.4.1/src/zope/app/locales onlinehelp svn://svn.zope.org/repos/main/zope.app.onlinehelp/tags/3.4.1/src/zope/app/onlinehelp pagetemplate svn://svn.zope.org/repos/main/zope.app.pagetemplate/tags/3.4.0/src/zope/app/pagetemplate pluggableauth svn://svn.zope.org/repos/main/zope.app.pluggableauth/tags/3.4.0/src/zope/app/pluggableauth preference svn://svn.zope.org/repos/main/zope.app.preference/tags/3.4.1/src/zope/app/preference preview svn://svn.zope.org/repos/main/zope.app.preview/tags/3.4.0/src/zope/app/preview principalannotation svn://svn.zope.org/repos/main/zope.app.principalannotation/tags/3.4.0/src/zope/app/principalannotation publication svn://svn.zope.org/repos/main/zope.app.publication/tags/3.4.3/src/zope/app/publication publisher svn://svn.zope.org/repos/main/zope.app.publisher/tags/3.4.1/src/zope/app/publisher renderer svn://svn.zope.org/repos/main/zope.app.renderer/tags/3.4.0/src/zope/app/renderer rotterdam svn://svn.zope.org/repos/main/zope.app.rotterdam/tags/3.4.1/src/zope/app/rotterdam schema svn://svn.zope.org/repos/main/zope.app.schema/tags/3.4.0/src/zope/app/schema security svn://svn.zope.org/repos/main/zope.app.security/tags/3.4.0/src/zope/app/security securitypolicy svn://svn.zope.org/repos/main/zope.app.securitypolicy/tags/3.4.6/src/zope/app/securitypolicy session svn://svn.zope.org/repos/main/zope.app.session/tags/3.5.1/src/zope/app/session skins svn://svn.zope.org/repos/main/zope.app.skins/tags/3.4.0/src/zope/app/skins sqlscript svn://svn.zope.org/repos/main/zope.app.sqlscript/tags/3.4.1/src/zope/app/sqlscript testing svn://svn.zope.org/repos/main/zope.app.testing/tags/3.4.1/src/zope/app/testing traversing svn://svn.zope.org/repos/main/zope.app.traversing/tags/3.4.0/src/zope/app/traversing tree
[Zope-Checkins] SVN: Zope/branches/gsoc-python-2.5/lib/python/ - ZODB 3.8.1b9
Log message for revision 92172: - ZODB 3.8.1b9 Changed: _U Zope/branches/gsoc-python-2.5/lib/python/ -=- Property changes on: Zope/branches/gsoc-python-2.5/lib/python ___ Name: svn:externals - BTrees svn://svn.zope.org/repos/main/ZODB/tags/3.8.0/src/BTrees ClientForm svn://svn.zope.org/repos/main/Zope3/trunk/src/ClientForm RestrictedPython svn://svn.zope.org/repos/main/RestrictedPython/trunk/src/RestrictedPython ThreadedAsync svn://svn.zope.org/repos/main/ZODB/tags/3.8.0/src/ThreadedAsync ZConfig svn://svn.zope.org/repos/main/ZConfig/tags/2.5.1/ZConfig ZEO svn://svn.zope.org/repos/main/ZODB/tags/3.8.0/src/ZEO ZODB svn://svn.zope.org/repos/main/ZODB/tags/3.8.0/src/ZODB ZopeUndo svn://svn.zope.org/repos/main/ZODB/tags/3.8.0/src/ZopeUndo docutils svn://svn.zope.org/repos/main/docutils/tags/0.4.0 mechanizesvn://svn.zope.org/repos/main/Zope3/trunk/src/mechanize persistent svn://svn.zope.org/repos/main/ZODB/tags/3.8.0/src/persistent pytz svn://svn.zope.org/repos/main/Zope3/trunk/src/pytz transaction svn://svn.zope.org/repos/main/ZODB/tags/3.8.0/src/transaction zdaemon svn://svn.zope.org/repos/main/zdaemon/tags/2.0.2/src/zdaemon zodbcode svn://svn.zope.org/repos/main/zodbcode/tags/3.4.0/src/zodbcode + BTrees svn://svn.zope.org/repos/main/ZODB/tags/3.8.1b9/src/BTrees ClientForm svn://svn.zope.org/repos/main/Zope3/trunk/src/ClientForm RestrictedPython svn://svn.zope.org/repos/main/RestrictedPython/trunk/src/RestrictedPython ThreadedAsync svn://svn.zope.org/repos/main/ZODB/tags/3.8.1b9/src/ThreadedAsync ZConfig svn://svn.zope.org/repos/main/ZConfig/tags/2.5.1/ZConfig ZEO svn://svn.zope.org/repos/main/ZODB/tags/3.8.1b9/src/ZEO ZODB svn://svn.zope.org/repos/main/ZODB/tags/3.8.1b9/src/ZODB ZopeUndo svn://svn.zope.org/repos/main/ZODB/tags/3.8.1b9/src/ZopeUndo docutils svn://svn.zope.org/repos/main/docutils/tags/0.4.0 mechanizesvn://svn.zope.org/repos/main/Zope3/trunk/src/mechanize persistent svn://svn.zope.org/repos/main/ZODB/tags/3.8.1b9/src/persistent pytz svn://svn.zope.org/repos/main/Zope3/trunk/src/pytz transaction svn://svn.zope.org/repos/main/ZODB/tags/3.8.1b9/src/transaction zdaemon svn://svn.zope.org/repos/main/zdaemon/tags/2.0.2/src/zdaemon zodbcode svn://svn.zope.org/repos/main/zodbcode/tags/3.4.0/src/zodbcode ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/gsoc-python-2.5/lib/python/ - Convert another string exception to normal exception
Log message for revision 92176:
- Convert another string exception to normal exception
Changed:
U Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Util.py
U Zope/branches/gsoc-python-2.5/lib/python/Shared/DC/ZRDB/sqlvar.py
-=-
Modified: Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Util.py
===
--- Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Util.py
2008-10-13 21:07:59 UTC (rev 92175)
+++ Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Util.py
2008-10-13 21:31:16 UTC (rev 92176)
@@ -42,7 +42,9 @@
str=__builtins__['str'] # Wa, w needed for pickling wa
-ParseError='Document Template Parse Error'
+class ParseError(Exception):
+Document Template Parse Error
+
from zExceptions import Unauthorized as ValidationError
def int_param(params,md,name,default=0, st=type('')):
@@ -248,37 +250,37 @@
if v[:1]=='' and v[-1:]=='' and len(v) 1: # expr shorthand
if used(attr):
-raise ParseError, ('%s and expr given' % attr, tag)
+raise ParseError('%s and expr given' % attr, tag)
if expr:
if used('expr'):
-raise ParseError, ('two exprs given', tag)
+raise ParseError('two exprs given', tag)
v=v[1:-1]
try: expr=Eval(v)
except SyntaxError, v:
-raise ParseError, (
+raise ParseError(
'strongExpression (Python) Syntax error/strong:'
'\npre\n%s\n/pre\n' % v[0],
tag)
return v, expr
-else: raise ParseError, (
+else: raise ParseError(
'The ... shorthand for expr was used in a tag '
'that doesn\'t support expr attributes.',
tag)
else: # name shorthand
if used(attr):
-raise ParseError, ('Two %s values were given' % attr, tag)
+raise ParseError('Two %s values were given' % attr, tag)
if expr:
if used('expr'):
# raise 'Waa', 'waaa'
-raise ParseError, ('%s and expr given' % attr, tag)
+raise ParseError('%s and expr given' % attr, tag)
return params[''],None
return params['']
elif used(attr):
if expr:
if used('expr'):
-raise ParseError, ('%s and expr given' % attr, tag)
+raise ParseError('%s and expr given' % attr, tag)
return params[attr],None
return params[attr]
elif expr and used('expr'):
@@ -286,7 +288,7 @@
expr=Eval(name)
return name, expr
-raise ParseError, ('No %s given' % attr, tag)
+raise ParseError('No %s given' % attr, tag)
Expr_doc=
@@ -399,11 +401,11 @@
l=len(mo_unp.group(1))
if result:
if parms.has_key(name):
-if parms[name] is None: raise ParseError, (
+if parms[name] is None: raise ParseError(
'Attribute %s requires a value' % name, tag)
result[name]=parms[name]
-else: raise ParseError, (
+else: raise ParseError(
'Invalid attribute name, %s' % name, tag)
else:
result['']=name
@@ -411,22 +413,22 @@
elif mo_unq:
name=mo_unq.group(2)
l=len(mo_unq.group(1))
-if result: raise ParseError, (
+if result: raise ParseError(
'Invalid attribute name, %s' % name, tag)
else: result['']=name
return parse_params(text[l:],result,**parms)
else:
if not text or not text.strip(): return result
-raise ParseError, ('invalid parameter: %s' % text, tag)
+raise ParseError('invalid parameter: %s' % text, tag)
if not parms.has_key(name):
-raise ParseError, (
+raise ParseError(
'Invalid attribute name, %s' % name, tag)
if result.has_key(name):
p=parms[name]
if type(p) is not ListType or p:
-raise ParseError, (
+raise ParseError(
'Duplicate values for attribute %s' % name, tag)
result[name]=value
Modified: Zope/branches/gsoc-python-2.5/lib/python/Shared/DC/ZRDB/sqlvar.py
===
--- Zope/branches/gsoc-python-2.5/lib/python/Shared/DC/ZRDB/sqlvar.py
2008-10-13 21:07:59 UTC (rev 92175)
+++ Zope/branches/gsoc-python-2.5/lib/python/Shared/DC/ZRDB/sqlvar.py
2008-10-13 21:31:16 UTC (rev 92176)
@@ -78,10 +78,10 @@
self.args=args
if not args.has_key('type'):
-raise ParseError, ('the type attribute is required', 'dtvar')
+raise
[Zope-Checkins] SVN: Zope/branches/gsoc-python-2.5/lib/python/ - Cleanup DocumentTemplate module for relative imports
Log message for revision 92178:
- Cleanup DocumentTemplate module for relative imports
Changed:
U Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_HTML.py
U Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_If.py
U Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_In.py
U Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_InSV.py
U Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Let.py
U Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Raise.py
U Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Return.py
U Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_String.py
U Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Try.py
U Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_UI.py
U Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Util.py
U Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Var.py
U Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_With.py
D
Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DocumentTemplate.py
U Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/VSEval.py
A
Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/_DocumentTemplate.py
U Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/__init__.py
U Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/html_quote.py
U
Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/pDocumentTemplate.py
U Zope/branches/gsoc-python-2.5/lib/python/Shared/DC/ZRDB/sqlvar.py
-=-
Modified: Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_HTML.py
===
--- Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_HTML.py
2008-10-13 21:46:29 UTC (rev 92177)
+++ Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_HTML.py
2008-10-13 21:50:06 UTC (rev 92178)
@@ -14,9 +14,9 @@
$Id$
-from DT_String import String, FileMixin
-import DT_String, re
-from DT_Util import ParseError, str
+import re
+from DocumentTemplate.DT_String import String, FileMixin
+from DocumentTemplate.DT_Util import ParseError, str
class dtml_re_class:
This needs to be replaced before 2.4. It's a hackaround.
@@ -129,7 +129,7 @@
def start(self, *args):
return self._start
-class HTML(DT_String.String):
+class HTML(String):
HTML Document Templates
HTML Document templates use HTML server-side-include syntax,
Modified: Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_If.py
===
--- Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_If.py
2008-10-13 21:46:29 UTC (rev 92177)
+++ Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_If.py
2008-10-13 21:50:06 UTC (rev 92178)
@@ -78,7 +78,7 @@
__rcs_id__='$Id$'
__version__='$Revision: 1.19 $'[11:-2]
-from DT_Util import ParseError, parse_params, name_param, str
+from DocumentTemplate.DT_Util import ParseError, parse_params, name_param, str
class If:
blockContinuations='else','elif'
Modified: Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_In.py
===
--- Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_In.py
2008-10-13 21:46:29 UTC (rev 92177)
+++ Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_In.py
2008-10-13 21:50:06 UTC (rev 92178)
@@ -333,14 +333,18 @@
__version__='$Revision: 1.62 $'[11:-2]
import sys
-from DT_Util import ParseError, parse_params, name_param, str, join_unicode
-from DT_Util import render_blocks, InstanceDict, ValidationError, Eval
-from DT_Util import simple_name, add_with_prefix
import re
-from DT_InSV import sequence_variables, opt
-TupleType=type(())
-StringTypes = (type(''), type(u''))
+from DocumentTemplate.DT_Util import ParseError, parse_params, name_param
+from DocumentTemplate.DT_Util import str, join_unicode
+from DocumentTemplate.DT_Util import render_blocks, InstanceDict
+from DocumentTemplate.DT_Util import ValidationError, Eval
+from DocumentTemplate.DT_Util import simple_name, add_with_prefix
+from DocumentTemplate.DT_InSV import sequence_variables, opt
+
+TupleType = tuple
+StringTypes = (str, unicode)
+
class InFactory:
blockContinuations=('else',)
name='in'
Modified: Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_InSV.py
===
--- Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_InSV.py
2008-10-13 21:46:29 UTC (rev 92177)
+++ Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_InSV.py
2008-10-13 21:50:06 UTC (rev 92178)
@@ -18,12 +18,13 @@
from math import sqrt
import re
-TupleType=type(())
+
try:
import Missing
mv=Missing.Value
except:
[Zope-Checkins] SVN: Zope/branches/gsoc-python-2.5/lib/python/zope/app/ - Update to newer zope.app.security
Log message for revision 92183: - Update to newer zope.app.security Changed: _U Zope/branches/gsoc-python-2.5/lib/python/zope/app/ -=- Property changes on: Zope/branches/gsoc-python-2.5/lib/python/zope/app ___ Name: svn:externals - annotation svn://svn.zope.org/repos/main/zope.app.annotation/tags/3.4.0/src/zope/app/annotation apidoc svn://svn.zope.org/repos/main/zope.app.apidoc/tags/3.4.3/src/zope/app/apidoc applicationcontrol svn://svn.zope.org/repos/main/zope.app.applicationcontrol/tags/3.4.1/src/zope/app/applicationcontrol appsetup svn://svn.zope.org/repos/main/zope.app.appsetup/tags/3.4.1/src/zope/app/appsetup authentication svn://svn.zope.org/repos/main/zope.app.authentication/tags/3.4.1/src/zope/app/authentication basicskin svn://svn.zope.org/repos/main/zope.app.basicskin/tags/3.4.0/src/zope/app/basicskin broken svn://svn.zope.org/repos/main/zope.app.broken/tags/3.4.0/src/zope/app/broken cache svn://svn.zope.org/repos/main/zope.app.cache/tags/3.4.0/src/zope/app/cache component svn://svn.zope.org/repos/main/zope.app.component/trunk/src/zope/app/component container svn://svn.zope.org/repos/main/zope.app.container/trunk/src/zope/app/container content svn://svn.zope.org/repos/main/zope.app.content/tags/3.4.0/src/zope/app/content debug svn://svn.zope.org/repos/main/zope.app.debug/tags/3.4.0/src/zope/app/debug dependable svn://svn.zope.org/repos/main/zope.app.dependable/tags/3.4.0/src/zope/app/dependable error svn://svn.zope.org/repos/main/zope.app.error/tags/3.5.1/src/zope/app/error exception svn://svn.zope.org/repos/main/zope.app.exception/tags/3.4.1/src/zope/app/exception file svn://svn.zope.org/repos/main/zope.app.file/tags/3.4.2/src/zope/app/file folder svn://svn.zope.org/repos/main/zope.app.folder/tags/3.4.0/src/zope/app/folder form svn://svn.zope.org/repos/main/zope.app.form/trunk/src/zope/app/form generations svn://svn.zope.org/repos/main/zope.app.generations/tags/3.4.1/src/zope/app/generations http svn://svn.zope.org/repos/main/zope.app.http/tags/3.4.1/src/zope/app/http i18n svn://svn.zope.org/repos/main/zope.app.i18n/tags/3.4.4/src/zope/app/i18n interface svn://svn.zope.org/repos/main/zope.app.interface/tags/3.4.0/src/zope/app/interface intid svn://svn.zope.org/repos/main/zope.app.intid/tags/3.4.1/src/zope/app/intid keyreference svn://svn.zope.org/repos/main/zope.app.keyreference/tags/3.4.1/src/zope/app/keyreference layers svn://svn.zope.org/repos/main/zope.app.layers/tags/3.4.0/src/zope/app/layers locales svn://svn.zope.org/repos/main/zope.app.locales/tags/3.4.1/src/zope/app/locales onlinehelp svn://svn.zope.org/repos/main/zope.app.onlinehelp/tags/3.4.1/src/zope/app/onlinehelp pagetemplate svn://svn.zope.org/repos/main/zope.app.pagetemplate/tags/3.4.0/src/zope/app/pagetemplate pluggableauth svn://svn.zope.org/repos/main/zope.app.pluggableauth/tags/3.4.0/src/zope/app/pluggableauth preference svn://svn.zope.org/repos/main/zope.app.preference/tags/3.4.1/src/zope/app/preference preview svn://svn.zope.org/repos/main/zope.app.preview/tags/3.4.0/src/zope/app/preview principalannotation svn://svn.zope.org/repos/main/zope.app.principalannotation/tags/3.4.0/src/zope/app/principalannotation publication svn://svn.zope.org/repos/main/zope.app.publication/tags/3.4.3/src/zope/app/publication publisher svn://svn.zope.org/repos/main/zope.app.publisher/trunk/src/zope/app/publisher renderer svn://svn.zope.org/repos/main/zope.app.renderer/tags/3.4.0/src/zope/app/renderer rotterdam svn://svn.zope.org/repos/main/zope.app.rotterdam/tags/3.4.1/src/zope/app/rotterdam schema svn://svn.zope.org/repos/main/zope.app.schema/tags/3.4.0/src/zope/app/schema security svn://svn.zope.org/repos/main/zope.app.security/tags/3.4.0/src/zope/app/security securitypolicy svn://svn.zope.org/repos/main/zope.app.securitypolicy/tags/3.4.6/src/zope/app/securitypolicy session svn://svn.zope.org/repos/main/zope.app.session/tags/3.5.1/src/zope/app/session skins svn://svn.zope.org/repos/main/zope.app.skins/tags/3.4.0/src/zope/app/skins sqlscript svn://svn.zope.org/repos/main/zope.app.sqlscript/tags/3.4.1/src/zope/app/sqlscript testing svn://svn.zope.org/repos/main/zope.app.testing/tags/3.4.1/src/zope/app/testing traversing svn://svn.zope.org/repos/main/zope.app.traversing/tags/3.4.0/src/zope/app/traversing tree svn://svn.zope.org/repos/main/zope.app.tree/tags/3.4.0/src/zope/app/tree undo
