Skip to content

Z
Zope
Commit db9a0eeb authored by Jim Fulton's avatar Jim Fulton
Browse files
Options

Untabified.

parent 7a9d0080
Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 164 deletions
lib/python/OFS/SimpleItem.py
View file @ db9a0eeb
......@@ -89,8 +89,8 @@ Aqueduct database adapters, etc.
This module can also be used as a simple template for implementing new
item types.
$Id: SimpleItem.py,v 1.44 1999/04/02 00:11:40 jim Exp $'''
__version__='$Revision: 1.44 $'[11:-2]
$Id: SimpleItem.py,v 1.45 1999/04/09 17:17:02 jim Exp $'''
__version__='$Revision: 1.45 $'[11:-2]
import regex, sys, Globals, App.Management, Acquisition
from webdav.Resource import Resource
......@@ -132,8 +132,8 @@ class Item(Base, Resource, CopySource, App.Management.Tabs):
__ac_permissions__=(
('View management screens', ('manage_workspace',)),
)
('View management screens', ('manage_workspace',)),
)
manage_info =Globals.HTMLFile('App/manage_info')
......@@ -145,7 +145,7 @@ class Item(Base, Resource, CopySource, App.Management.Tabs):
try:
m=self.manage_options[0]['action']
if m=='manage_workspace': raise TypeError
except: return 'This object has no management interface'
except: return 'This object has no management interface'
if find(m,'/'):
raise 'Redirect', (
......@@ -392,7 +392,7 @@ class SimpleItem(Item, Globals.Persistent,
"""
manage_options=(
{'label':'Security', 'action':'manage_access'},
)
{'label':'Security', 'action':'manage_access'},
)
__ac_permissions__=(('View', ()),)
lib/python/Shared/DC/ZRDB/sqlvar.py
View file @ db9a0eeb
......@@ -119,7 +119,7 @@
however, if x is ommitted or an empty string, then the value
inserted is 'null'.
'''
__rcs_id__='$Id: sqlvar.py,v 1.7 1999/03/25 13:31:04 jeffrey Exp $'
__rcs_id__='$Id: sqlvar.py,v 1.8 1999/04/09 17:17:38 jim Exp $'
############################################################################
# Copyright
......@@ -129,7 +129,7 @@ __rcs_id__='$Id: sqlvar.py,v 1.7 1999/03/25 13:31:04 jeffrey Exp $'
# rights reserved.
#
############################################################################
__version__='$Revision: 1.7 $'[11:-2]
__version__='$Revision: 1.8 $'[11:-2]
from DocumentTemplate.DT_Util import ParseError, parse_params, name_param
from string import find, split, join, atoi, atof
......@@ -188,11 +188,11 @@ class SQLVar:
else:
v=str(v)
if not v and t=='nb':
if args.has_key('optional') and args['optional']:
return 'null'
else:
raise ValueError, (
'Invalid empty string value for <em>%s</em>' % name)
if args.has_key('optional') and args['optional']:
return 'null'
else:
raise ValueError, (
'Invalid empty string value for <em>%s</em>' % name)
v=md.getitem('sql_quote__',0)(v)
#if find(v,"\'") >= 0: v=join(split(v,"\'"),"''")
......
utilities/bbb.py
View file @ db9a0eeb
......@@ -189,17 +189,17 @@ def _read_and_report(file, rpt=None, fromEnd=0, both=0, n=99999999, show=0):
if n < 1: break
seek(pos+24)
if plen > 0:
p=read(plen)
if p[-1:] != '.':
error('Corrupted pickle at %s %s %s' % (pos,plen,len(p)))
if show > 0:
seek(pos+24)
error(read(show))
err=1
break
else: p=''
if plen > 0:
p=read(plen)
if p[-1:] != '.':
error('Corrupted pickle at %s %s %s' % (pos,plen,len(p)))
if show > 0:
seek(pos+24)
error(read(show))
err=1
break
else: p=''
t=split(read(tlen-plen-28),'\t')
tname, user = (t+[''])[:2]
t=join(t[2:],'\t')
......@@ -208,7 +208,7 @@ def _read_and_report(file, rpt=None, fromEnd=0, both=0, n=99999999, show=0):
s=s+f
start="%.4d-%.2d-%.2d %.2d:%.2d:%.3f" % (y,m,d,h,mn,s)
rpt(pos,oid,start,tname,user,t,p,first)
first=0
first=0
if err and both and not fromEnd:
_read_and_report(file, rpt, 1, 0, n, show)
......@@ -237,13 +237,13 @@ def xml(pos, oid, start, tname, user, t, p, first):
if first: write('<?xml version="1.0">\n<ZopeData>\n')
if pos is None:
write('</transaction>\n')
write('</ZopeData>\n')
return
write('</transaction>\n')
write('</ZopeData>\n')
return
if user or t or first:
if pos > 9: write('</transaction>\n')
write('<transaction name="%s" user="%s">\n%s\n' % (tname, user,t))
if pos > 9: write('</transaction>\n')
write('<transaction name="%s" user="%s">\n%s\n' % (tname, user,t))
l=len(p)
pp=p
f=StringIO(p)
......@@ -251,7 +251,7 @@ def xml(pos, oid, start, tname, user, t, p, first):
u.idprefix='%s.' % pos
p=u.load().__str__(4)
if f.tell() < l:
p=p+u.load().__str__(4)
p=p+u.load().__str__(4)
write(' <rec id="%s" time="%s">\n%s </rec>\n' % (oid, start, p))
def xmls(pos, oid, start, tname, user, t, p, first):
......@@ -259,14 +259,14 @@ def xmls(pos, oid, start, tname, user, t, p, first):
if first: write('<?xml version="1.0">\n<transactions>\n')
if pos is None:
write('</transaction>\n')
write('</transactioons>\n')
return
write('</transaction>\n')
write('</transactioons>\n')
return
if user or t or first:
if pos > 9: write('</transaction>\n')
write('<transaction name="%s" user="%s">\n%s\n' % (tname, user,t))
if pos > 9: write('</transaction>\n')
write('<transaction name="%s" user="%s">\n%s\n' % (tname, user,t))
reports={
'none': (none,
('Read a database file checking for errors',
......
utilities/ppml.py
View file @ db9a0eeb
......@@ -95,15 +95,15 @@ import struct
class Global:
def __init__(self, module, name):
self.module=module
self.name=name
self.module=module
self.name=name
def __str__(self, indent=0):
if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id=''
name=string.lower(self.__class__.__name__)
return '%s<%s%s name="%s" module="%s"/>\n' % (
' '*indent, name, id, self.name, self.module)
if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id=''
name=string.lower(self.__class__.__name__)
return '%s<%s%s name="%s" module="%s"/>\n' % (
' '*indent, name, id, self.name, self.module)
class Scalar:
......@@ -112,16 +112,16 @@ class Scalar:
def value(self): return self._v
def __str__(self, indent=0):
if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id=''
name=string.lower(self.__class__.__name__)
return '%s<%s%s>%s</%s>\n' % (
' '*indent, name, id, self.value(), name)
if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id=''
name=string.lower(self.__class__.__name__)
return '%s<%s%s>%s</%s>\n' % (
' '*indent, name, id, self.value(), name)
def xmlstr(v):
v=`v`
if v[:1]=='\'':
v=string.replace(v,'"','\\"')
v=string.replace(v,'"','\\"')
v=replace(v,'%','\\045')
v=replace(v,'&','\\046')
return v[1:-1]
......@@ -140,29 +140,29 @@ class Wrapper:
def value(self): return self._v
def __str__(self, indent=0):
if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id=''
name=string.lower(self.__class__.__name__)
v=self._v
i=' '*indent
if isinstance(v,Scalar):
return '%s<%s%s>%s</%s>\n' % (i, name, id, str(v)[:-1], name)
else:
v=v.__str__(indent+2)
return '%s<%s%s>\n%s%s</%s>\n' % (i, name, id, v, i, name)
if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id=''
name=string.lower(self.__class__.__name__)
v=self._v
i=' '*indent
if isinstance(v,Scalar):
return '%s<%s%s>%s</%s>\n' % (i, name, id, str(v)[:-1], name)
else:
v=v.__str__(indent+2)
return '%s<%s%s>\n%s%s</%s>\n' % (i, name, id, v, i, name)
class Collection:
def __str__(self, indent=0):
if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id=''
name=string.lower(self.__class__.__name__)
i=' '*indent
if self:
return '%s<%s%s>\n%s%s</%s>\n' % (
i, name, id, self.value(indent+2), i, name)
else:
return '%s<%s%s/>\n' % (i, name, id)
if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id=''
name=string.lower(self.__class__.__name__)
i=' '*indent
if self:
return '%s<%s%s>\n%s%s</%s>\n' % (
i, name, id, self.value(indent+2), i, name)
else:
return '%s<%s%s/>\n' % (i, name, id)
class Key(Wrapper): pass
class Value(Wrapper): pass
......@@ -172,35 +172,35 @@ class Dictionary(Collection):
def __len__(self): return len(self._d)
def __setitem__(self, k, v): self._d[k]=v
def value(self, indent):
return string.join(
map(lambda i, ind=' '*indent, indent=indent+4:
'%s<item>\n'
'%s'
'%s'
'%s</item>\n'
%
(ind,
Key(i[0]).__str__(indent),
Value(i[1]).__str__(indent),
ind),
self._d.items()
),
'')
return string.join(
map(lambda i, ind=' '*indent, indent=indent+4:
'%s<item>\n'
'%s'
'%s'
'%s</item>\n'
%
(ind,
Key(i[0]).__str__(indent),
Value(i[1]).__str__(indent),
ind),
self._d.items()
),
'')
class Sequence(Collection):
def __init__(self, v=None):
if not v: v=[]
self._subs=v
if not v: v=[]
self._subs=v
def __len__(self): return len(self._subs)
def append(self, v): self._subs.append(v)
def value(self, indent):
return string.join(map(
lambda v, indent=indent: v.__str__(indent),
self._subs),'')
return string.join(map(
lambda v, indent=indent: v.__str__(indent),
self._subs),'')
class List(Sequence): pass
class Tuple(Sequence): pass
......@@ -217,15 +217,15 @@ none=none()
class Reference(Scalar):
def __init__(self, v): self._v=v
def __str__(self, indent=0):
v=self._v
name=string.lower(self.__class__.__name__)
return '%s<%s id="%s"/>\n' % (' '*indent,name,v)
v=self._v
name=string.lower(self.__class__.__name__)
return '%s<%s id="%s"/>\n' % (' '*indent,name,v)
Get=Reference
class Object(Sequence):
def __init__(self, klass, args):
self._subs=[Klass(klass), args]
self._subs=[Klass(klass), args]
def __setstate__(self, v): self.append(State(v))
......@@ -237,7 +237,7 @@ class ToXMLUnpickler(Unpickler):
dispatch.update(Unpickler.dispatch)
def persistent_load(self, v):
return Persistent(v)
return Persistent(v)
def load_persid(self):
pid = self.readline()[:-1]
......@@ -274,7 +274,7 @@ class ToXMLUnpickler(Unpickler):
def load_string(self):
self.append(String(eval(self.readline()[:-1],
{'__builtins__': {}}))) # Let's be careful
{'__builtins__': {}}))) # Let's be careful
dispatch[STRING] = load_string
def load_binstring(self):
......@@ -327,7 +327,7 @@ class ToXMLUnpickler(Unpickler):
module = self.readline()[:-1]
name = self.readline()[:-1]
klass = self.find_class(module, name)
value=Object(Global(module, klass), args)
value=Object(Global(module, klass), args)
self.append(value)
dispatch[INST] = load_inst
......@@ -338,7 +338,7 @@ class ToXMLUnpickler(Unpickler):
del stack[k + 1]
args = Tuple(stack[k + 1:])
del stack[k:]
value=Object(klass,args)
value=Object(klass,args)
self.append(value)
dispatch[OBJ] = load_obj
......@@ -355,7 +355,7 @@ class ToXMLUnpickler(Unpickler):
arg_tup = stack[-1]
del stack[-2:]
value=Object(callable, arg_tup)
value=Object(callable, arg_tup)
self.append(value)
dispatch[REDUCE] = load_reduce
......@@ -376,17 +376,17 @@ class ToXMLUnpickler(Unpickler):
dispatch[LONG_BINGET] = load_long_binget
def load_put(self):
self.stack[-1].id=self.idprefix+self.readline()[:-1]
self.stack[-1].id=self.idprefix+self.readline()[:-1]
dispatch[PUT] = load_put
def load_binput(self):
i = mloads('i' + self.read(1) + '\000\000\000')
self.stack[-1].id=self.idprefix+`i`
self.stack[-1].id=self.idprefix+`i`
dispatch[BINPUT] = load_binput
def load_long_binput(self):
i = mloads('i' + self.read(4))
self.stack[-1].id=self.idprefix+`i`
self.stack[-1].id=self.idprefix+`i`
dispatch[LONG_BINPUT] = load_long_binput
def ToXMLload(file):
......@@ -440,15 +440,15 @@ from string import replace
class Global:
def __init__(self, module, name):
self.module=module
self.name=name
self.module=module
self.name=name
def __str__(self, indent=0):
if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id=''
name=string.lower(self.__class__.__name__)
return '%s<%s%s name="%s" module="%s"/>\n' % (
' '*indent, name, id, self.name, self.module)
if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id=''
name=string.lower(self.__class__.__name__)
return '%s<%s%s name="%s" module="%s"/>\n' % (
' '*indent, name, id, self.name, self.module)
class Scalar:
......@@ -457,16 +457,16 @@ class Scalar:
def value(self): return self._v
def __str__(self, indent=0):
if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id=''
name=string.lower(self.__class__.__name__)
return '%s<%s%s>%s</%s>\n' % (
' '*indent, name, id, self.value(), name)
if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id=''
name=string.lower(self.__class__.__name__)
return '%s<%s%s>%s</%s>\n' % (
' '*indent, name, id, self.value(), name)
def xmlstr(v):
v=`v`
if v[:1]=='\'':
v=string.replace(v,'"','\\"')
v=string.replace(v,'"','\\"')
v=replace(v,'%','\\045')
v=replace(v,'&','\\046')
return v[1:-1]
......@@ -485,29 +485,29 @@ class Wrapper:
def value(self): return self._v
def __str__(self, indent=0):
if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id=''
name=string.lower(self.__class__.__name__)
v=self._v
i=' '*indent
if isinstance(v,Scalar):
return '%s<%s%s>%s</%s>\n' % (i, name, id, str(v)[:-1], name)
else:
v=v.__str__(indent+2)
return '%s<%s%s>\n%s%s</%s>\n' % (i, name, id, v, i, name)
if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id=''
name=string.lower(self.__class__.__name__)
v=self._v
i=' '*indent
if isinstance(v,Scalar):
return '%s<%s%s>%s</%s>\n' % (i, name, id, str(v)[:-1], name)
else:
v=v.__str__(indent+2)
return '%s<%s%s>\n%s%s</%s>\n' % (i, name, id, v, i, name)
class Collection:
def __str__(self, indent=0):
if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id=''
name=string.lower(self.__class__.__name__)
i=' '*indent
if self:
return '%s<%s%s>\n%s%s</%s>\n' % (
i, name, id, self.value(indent+2), i, name)
else:
return '%s<%s%s/>\n' % (i, name, id)
if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id=''
name=string.lower(self.__class__.__name__)
i=' '*indent
if self:
return '%s<%s%s>\n%s%s</%s>\n' % (
i, name, id, self.value(indent+2), i, name)
else:
return '%s<%s%s/>\n' % (i, name, id)
class Key(Wrapper): pass
class Value(Wrapper): pass
......@@ -517,35 +517,35 @@ class Dictionary(Collection):
def __len__(self): return len(self._d)
def __setitem__(self, k, v): self._d.append((k,v))
def value(self, indent):
return string.join(
map(lambda i, ind=' '*indent, indent=indent+4:
'%s<item>\n'
'%s'
'%s'
'%s</item>\n'
%
(ind,
Key(i[0]).__str__(indent),
Value(i[1]).__str__(indent),
ind),
self._d
),
'')
return string.join(
map(lambda i, ind=' '*indent, indent=indent+4:
'%s<item>\n'
'%s'
'%s'
'%s</item>\n'
%
(ind,
Key(i[0]).__str__(indent),
Value(i[1]).__str__(indent),
ind),
self._d
),
'')
class Sequence(Collection):
def __init__(self, v=None):
if not v: v=[]
self._subs=v
if not v: v=[]
self._subs=v
def __len__(self): return len(self._subs)
def append(self, v): self._subs.append(v)
def value(self, indent):
return string.join(map(
lambda v, indent=indent: v.__str__(indent),
self._subs),'')
return string.join(map(
lambda v, indent=indent: v.__str__(indent),
self._subs),'')
class List(Sequence): pass
class Tuple(Sequence): pass
......@@ -562,15 +562,15 @@ none=none()
class Reference(Scalar):
def __init__(self, v): self._v=v
def __str__(self, indent=0):
v=self._v
name=string.lower(self.__class__.__name__)
return '%s<%s id="%s"/>\n' % (' '*indent,name,v)
v=self._v
name=string.lower(self.__class__.__name__)
return '%s<%s id="%s"/>\n' % (' '*indent,name,v)
Get=Reference
class Object(Sequence):
def __init__(self, klass, args):
self._subs=[Klass(klass), args]
self._subs=[Klass(klass), args]
def __setstate__(self, v): self.append(State(v))
......@@ -582,7 +582,7 @@ class ToXMLUnpickler(Unpickler):
dispatch.update(Unpickler.dispatch)
def persistent_load(self, v):
return Persistent(v)
return Persistent(v)
def load_persid(self):
pid = self.readline()[:-1]
......@@ -623,7 +623,7 @@ class ToXMLUnpickler(Unpickler):
def load_string(self):
self.append(String(eval(self.readline()[:-1],
{'__builtins__': {}}))) # Let's be careful
{'__builtins__': {}}))) # Let's be careful
dispatch[STRING] = load_string
def load_binstring(self):
......@@ -676,7 +676,7 @@ class ToXMLUnpickler(Unpickler):
module = self.readline()[:-1]
name = self.readline()[:-1]
klass = self.find_class(module, name)
value=Object(Global(module, klass), args)
value=Object(Global(module, klass), args)
self.append(value)
dispatch[INST] = load_inst
......@@ -687,7 +687,7 @@ class ToXMLUnpickler(Unpickler):
del stack[k + 1]
args = Tuple(stack[k + 1:])
del stack[k:]
value=Object(klass,args)
value=Object(klass,args)
self.append(value)
dispatch[OBJ] = load_obj
......@@ -704,7 +704,7 @@ class ToXMLUnpickler(Unpickler):
arg_tup = stack[-1]
del stack[-2:]
value=Object(callable, arg_tup)
value=Object(callable, arg_tup)
self.append(value)
dispatch[REDUCE] = load_reduce
......@@ -725,17 +725,17 @@ class ToXMLUnpickler(Unpickler):
dispatch[LONG_BINGET] = load_long_binget
def load_put(self):
self.stack[-1].id=self.idprefix+self.readline()[:-1]
self.stack[-1].id=self.idprefix+self.readline()[:-1]
dispatch[PUT] = load_put
def load_binput(self):
i = mloads('i' + self.read(1) + '\000\000\000')
self.stack[-1].id=self.idprefix+`i`
self.stack[-1].id=self.idprefix+`i`
dispatch[BINPUT] = load_binput
def load_long_binput(self):
i = mloads('i' + self.read(4))
self.stack[-1].id=self.idprefix+`i`
self.stack[-1].id=self.idprefix+`i`
dispatch[LONG_BINPUT] = load_long_binput
def ToXMLload(file):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7