Skip to content

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

untabified.

parent 709ac1c2
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 143 deletions
lib/python/Shared/DC/xml/ppml.py
View file @ c995656e
...@@ -140,7 +140,7 @@ def unconvert(encoding,S): ...@@ -140,7 +140,7 @@ def unconvert(encoding,S):
original = base64.decodestring(S) original = base64.decodestring(S)
else: else:
x = string.replace(S, '\n', '') x = string.replace(S, '\n', '')
original = eval("'"+x+"'") original = eval("'"+x+"'")
return original return original
t32 = 1L << 32 t32 = 1L << 32
...@@ -174,15 +174,15 @@ def cp(f1, f2, l): ...@@ -174,15 +174,15 @@ def cp(f1, f2, l):
class Global: class Global:
def __init__(self, module, name): def __init__(self, module, name):
self.module=module self.module=module
self.name=name self.name=name
def __str__(self, indent=0): def __str__(self, indent=0):
if hasattr(self, 'id'): id=' id="%s"' % self.id if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id='' else: id=''
name=string.lower(self.__class__.__name__) name=string.lower(self.__class__.__name__)
return '%s<%s%s name="%s" module="%s"/>\n' % ( return '%s<%s%s name="%s" module="%s"/>\n' % (
' '*indent, name, id, self.name, self.module) ' '*indent, name, id, self.name, self.module)
class Scalar: class Scalar:
...@@ -192,16 +192,16 @@ class Scalar: ...@@ -192,16 +192,16 @@ class Scalar:
def value(self): return self._v def value(self): return self._v
def __str__(self, indent=0): def __str__(self, indent=0):
if hasattr(self, 'id'): id=' id="%s"' % self.id if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id='' else: id=''
name=string.lower(self.__class__.__name__) name=string.lower(self.__class__.__name__)
return '%s<%s%s>%s</%s>\n' % ( return '%s<%s%s>%s</%s>\n' % (
' '*indent, name, id, self.value(), name) ' '*indent, name, id, self.value(), name)
def xmlstr(v): def xmlstr(v):
v=`v` v=`v`
if v[:1]=='\'': if v[:1]=='\'':
v=string.replace(v,'"','\\"') v=string.replace(v,'"','\\"')
v=replace(v,'%','\\045') v=replace(v,'%','\\045')
v=replace(v,'&','\\046') v=replace(v,'&','\\046')
return v[1:-1] return v[1:-1]
...@@ -231,29 +231,29 @@ class Wrapper: ...@@ -231,29 +231,29 @@ class Wrapper:
def value(self): return self._v def value(self): return self._v
def __str__(self, indent=0): def __str__(self, indent=0):
if hasattr(self, 'id'): id=' id="%s"' % self.id if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id='' else: id=''
name=string.lower(self.__class__.__name__) name=string.lower(self.__class__.__name__)
v=self._v v=self._v
i=' '*indent i=' '*indent
if isinstance(v,Scalar): if isinstance(v,Scalar):
return '%s<%s%s> %s </%s>\n' % (i, name, id, str(v)[:-1], name) return '%s<%s%s> %s </%s>\n' % (i, name, id, str(v)[:-1], name)
else: else:
v=v.__str__(indent+2) v=v.__str__(indent+2)
return '%s<%s%s>\n%s%s</%s>\n' % (i, name, id, v, i, name) return '%s<%s%s>\n%s%s</%s>\n' % (i, name, id, v, i, name)
class Collection: class Collection:
def __str__(self, indent=0): def __str__(self, indent=0):
if hasattr(self, 'id'): id=' id="%s"' % self.id if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id='' else: id=''
name=string.lower(self.__class__.__name__) name=string.lower(self.__class__.__name__)
i=' '*indent i=' '*indent
if self: if self:
return '%s<%s%s>\n%s%s</%s>\n' % ( return '%s<%s%s>\n%s%s</%s>\n' % (
i, name, id, self.value(indent+2), i, name) i, name, id, self.value(indent+2), i, name)
else: else:
return '%s<%s%s/>\n' % (i, name, id) return '%s<%s%s/>\n' % (i, name, id)
class Key(Wrapper): pass class Key(Wrapper): pass
class Value(Wrapper): pass class Value(Wrapper): pass
...@@ -263,35 +263,35 @@ class Dictionary(Collection): ...@@ -263,35 +263,35 @@ class Dictionary(Collection):
def __len__(self): return len(self._d) def __len__(self): return len(self._d)
def __setitem__(self, k, v): self._d[k]=v def __setitem__(self, k, v): self._d[k]=v
def value(self, indent): def value(self, indent):
return string.join( return string.join(
map(lambda i, ind=' '*indent, indent=indent+4: map(lambda i, ind=' '*indent, indent=indent+4:
'%s<item>\n' '%s<item>\n'
'%s' '%s'
'%s' '%s'
'%s</item>\n' '%s</item>\n'
% %
(ind, (ind,
Key(i[0]).__str__(indent), Key(i[0]).__str__(indent),
Value(i[1]).__str__(indent), Value(i[1]).__str__(indent),
ind), ind),
self._d.items() self._d.items()
), ),
'') '')
class Sequence(Collection): class Sequence(Collection):
def __init__(self, v=None): def __init__(self, v=None):
if not v: v=[] if not v: v=[]
self._subs=v self._subs=v
def __len__(self): return len(self._subs) def __len__(self): return len(self._subs)
def append(self, v): self._subs.append(v) def append(self, v): self._subs.append(v)
def value(self, indent): def value(self, indent):
return string.join(map( return string.join(map(
lambda v, indent=indent: v.__str__(indent), lambda v, indent=indent: v.__str__(indent),
self._subs),'') self._subs),'')
class List(Sequence): pass class List(Sequence): pass
class Tuple(Sequence): pass class Tuple(Sequence): pass
...@@ -308,15 +308,15 @@ none=none() ...@@ -308,15 +308,15 @@ none=none()
class Reference(Scalar): class Reference(Scalar):
def __init__(self, v): self._v=v def __init__(self, v): self._v=v
def __str__(self, indent=0): def __str__(self, indent=0):
v=self._v v=self._v
name=string.lower(self.__class__.__name__) name=string.lower(self.__class__.__name__)
return '%s<%s id="%s"/>\n' % (' '*indent,name,v) return '%s<%s id="%s"/>\n' % (' '*indent,name,v)
Get=Reference Get=Reference
class Object(Sequence): class Object(Sequence):
def __init__(self, klass, args): def __init__(self, klass, args):
self._subs=[Klass(klass), args] self._subs=[Klass(klass), args]
def __setstate__(self, v): self.append(State(v)) def __setstate__(self, v): self.append(State(v))
...@@ -445,7 +445,7 @@ class ToXMLUnpickler(Unpickler): ...@@ -445,7 +445,7 @@ class ToXMLUnpickler(Unpickler):
dispatch.update(Unpickler.dispatch) dispatch.update(Unpickler.dispatch)
def persistent_load(self, v): def persistent_load(self, v):
return Persistent(v) return Persistent(v)
def load_persid(self): def load_persid(self):
pid = self.readline()[:-1] pid = self.readline()[:-1]
...@@ -486,7 +486,7 @@ class ToXMLUnpickler(Unpickler): ...@@ -486,7 +486,7 @@ class ToXMLUnpickler(Unpickler):
def load_string(self): def load_string(self):
self.append(String(eval(self.readline()[:-1], self.append(String(eval(self.readline()[:-1],
{'__builtins__': {}}))) # Let's be careful {'__builtins__': {}}))) # Let's be careful
dispatch[STRING] = load_string dispatch[STRING] = load_string
def load_binstring(self): def load_binstring(self):
...@@ -538,7 +538,7 @@ class ToXMLUnpickler(Unpickler): ...@@ -538,7 +538,7 @@ class ToXMLUnpickler(Unpickler):
del self.stack[k:] del self.stack[k:]
module = self.readline()[:-1] module = self.readline()[:-1]
name = self.readline()[:-1] name = self.readline()[:-1]
value=Object(Global(module, name), args) value=Object(Global(module, name), args)
self.append(value) self.append(value)
dispatch[INST] = load_inst dispatch[INST] = load_inst
...@@ -549,7 +549,7 @@ class ToXMLUnpickler(Unpickler): ...@@ -549,7 +549,7 @@ class ToXMLUnpickler(Unpickler):
del stack[k + 1] del stack[k + 1]
args = Tuple(stack[k + 1:]) args = Tuple(stack[k + 1:])
del stack[k:] del stack[k:]
value=Object(klass,args) value=Object(klass,args)
self.append(value) self.append(value)
dispatch[OBJ] = load_obj dispatch[OBJ] = load_obj
...@@ -566,7 +566,7 @@ class ToXMLUnpickler(Unpickler): ...@@ -566,7 +566,7 @@ class ToXMLUnpickler(Unpickler):
arg_tup = stack[-1] arg_tup = stack[-1]
del stack[-2:] del stack[-2:]
value=Object(callable, arg_tup) value=Object(callable, arg_tup)
self.append(value) self.append(value)
dispatch[REDUCE] = load_reduce dispatch[REDUCE] = load_reduce
...@@ -587,17 +587,17 @@ class ToXMLUnpickler(Unpickler): ...@@ -587,17 +587,17 @@ class ToXMLUnpickler(Unpickler):
dispatch[LONG_BINGET] = load_long_binget dispatch[LONG_BINGET] = load_long_binget
def load_put(self): 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 dispatch[PUT] = load_put
def load_binput(self): def load_binput(self):
i = mloads('i' + self.read(1) + '\000\000\000') 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 dispatch[BINPUT] = load_binput
def load_long_binput(self): def load_long_binput(self):
i = mloads('i' + self.read(4)) 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 dispatch[LONG_BINPUT] = load_long_binput
......
lib/python/TreeDisplay/TreeTag.py
View file @ c995656e
...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
############################################################################## ##############################################################################
"""Rendering object hierarchies as Trees """Rendering object hierarchies as Trees
""" """
__rcs_id__='$Id: TreeTag.py,v 1.32 1999/07/08 19:48:04 petrilli Exp $' __rcs_id__='$Id: TreeTag.py,v 1.33 1999/07/13 14:21:57 jim Exp $'
__version__='$Revision: 1.32 $'[11:-2] __version__='$Revision: 1.33 $'[11:-2]
from DocumentTemplate.DT_Util import * from DocumentTemplate.DT_Util import *
from DocumentTemplate.DT_String import String from DocumentTemplate.DT_String import String
...@@ -336,8 +336,8 @@ def tpRenderTABLE(self, id, root_url, url, state, substate, diff, data, ...@@ -336,8 +336,8 @@ def tpRenderTABLE(self, id, root_url, url, state, substate, diff, data,
for i in size: for i in size:
items[i]=items[i][1] items[i]=items[i][1]
if have_arg('reverse'): if have_arg('reverse'):
items.reverse() items.reverse()
diff.append(id) diff.append(id)
...@@ -655,14 +655,3 @@ def oid(self): ...@@ -655,14 +655,3 @@ def oid(self):
#icoSpace='<IMG SRC="Blank_icon" BORDER="0">' #icoSpace='<IMG SRC="Blank_icon" BORDER="0">'
#icoPlus ='<IMG SRC="Plus_icon" BORDER="0">' #icoPlus ='<IMG SRC="Plus_icon" BORDER="0">'
#icoMinus='<IMG SRC="Minus_icon" BORDER="0">' #icoMinus='<IMG SRC="Minus_icon" BORDER="0">'
utilities/ppml.py
View file @ c995656e
...@@ -143,7 +143,7 @@ def unconvert(encoding,S): ...@@ -143,7 +143,7 @@ def unconvert(encoding,S):
original = base64.decodestring(S) original = base64.decodestring(S)
else: else:
x = string.replace(S, '\n', '') x = string.replace(S, '\n', '')
original = eval("'"+x+"'") original = eval("'"+x+"'")
return original return original
t32 = 1L << 32 t32 = 1L << 32
...@@ -177,15 +177,15 @@ def cp(f1, f2, l): ...@@ -177,15 +177,15 @@ def cp(f1, f2, l):
class Global: class Global:
def __init__(self, module, name): def __init__(self, module, name):
self.module=module self.module=module
self.name=name self.name=name
def __str__(self, indent=0): def __str__(self, indent=0):
if hasattr(self, 'id'): id=' id="%s"' % self.id if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id='' else: id=''
name=string.lower(self.__class__.__name__) name=string.lower(self.__class__.__name__)
return '%s<%s%s name="%s" module="%s"/>\n' % ( return '%s<%s%s name="%s" module="%s"/>\n' % (
' '*indent, name, id, self.name, self.module) ' '*indent, name, id, self.name, self.module)
class Scalar: class Scalar:
...@@ -195,16 +195,16 @@ class Scalar: ...@@ -195,16 +195,16 @@ class Scalar:
def value(self): return self._v def value(self): return self._v
def __str__(self, indent=0): def __str__(self, indent=0):
if hasattr(self, 'id'): id=' id="%s"' % self.id if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id='' else: id=''
name=string.lower(self.__class__.__name__) name=string.lower(self.__class__.__name__)
return '%s<%s%s>%s</%s>\n' % ( return '%s<%s%s>%s</%s>\n' % (
' '*indent, name, id, self.value(), name) ' '*indent, name, id, self.value(), name)
def xmlstr(v): def xmlstr(v):
v=`v` v=`v`
if v[:1]=='\'': if v[:1]=='\'':
v=string.replace(v,'"','\\"') v=string.replace(v,'"','\\"')
v=replace(v,'%','\\045') v=replace(v,'%','\\045')
v=replace(v,'&','\\046') v=replace(v,'&','\\046')
return v[1:-1] return v[1:-1]
...@@ -234,29 +234,29 @@ class Wrapper: ...@@ -234,29 +234,29 @@ class Wrapper:
def value(self): return self._v def value(self): return self._v
def __str__(self, indent=0): def __str__(self, indent=0):
if hasattr(self, 'id'): id=' id="%s"' % self.id if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id='' else: id=''
name=string.lower(self.__class__.__name__) name=string.lower(self.__class__.__name__)
v=self._v v=self._v
i=' '*indent i=' '*indent
if isinstance(v,Scalar): if isinstance(v,Scalar):
return '%s<%s%s> %s </%s>\n' % (i, name, id, str(v)[:-1], name) return '%s<%s%s> %s </%s>\n' % (i, name, id, str(v)[:-1], name)
else: else:
v=v.__str__(indent+2) v=v.__str__(indent+2)
return '%s<%s%s>\n%s%s</%s>\n' % (i, name, id, v, i, name) return '%s<%s%s>\n%s%s</%s>\n' % (i, name, id, v, i, name)
class Collection: class Collection:
def __str__(self, indent=0): def __str__(self, indent=0):
if hasattr(self, 'id'): id=' id="%s"' % self.id if hasattr(self, 'id'): id=' id="%s"' % self.id
else: id='' else: id=''
name=string.lower(self.__class__.__name__) name=string.lower(self.__class__.__name__)
i=' '*indent i=' '*indent
if self: if self:
return '%s<%s%s>\n%s%s</%s>\n' % ( return '%s<%s%s>\n%s%s</%s>\n' % (
i, name, id, self.value(indent+2), i, name) i, name, id, self.value(indent+2), i, name)
else: else:
return '%s<%s%s/>\n' % (i, name, id) return '%s<%s%s/>\n' % (i, name, id)
class Key(Wrapper): pass class Key(Wrapper): pass
class Value(Wrapper): pass class Value(Wrapper): pass
...@@ -266,35 +266,35 @@ class Dictionary(Collection): ...@@ -266,35 +266,35 @@ class Dictionary(Collection):
def __len__(self): return len(self._d) def __len__(self): return len(self._d)
def __setitem__(self, k, v): self._d[k]=v def __setitem__(self, k, v): self._d[k]=v
def value(self, indent): def value(self, indent):
return string.join( return string.join(
map(lambda i, ind=' '*indent, indent=indent+4: map(lambda i, ind=' '*indent, indent=indent+4:
'%s<item>\n' '%s<item>\n'
'%s' '%s'
'%s' '%s'
'%s</item>\n' '%s</item>\n'
% %
(ind, (ind,
Key(i[0]).__str__(indent), Key(i[0]).__str__(indent),
Value(i[1]).__str__(indent), Value(i[1]).__str__(indent),
ind), ind),
self._d.items() self._d.items()
), ),
'') '')
class Sequence(Collection): class Sequence(Collection):
def __init__(self, v=None): def __init__(self, v=None):
if not v: v=[] if not v: v=[]
self._subs=v self._subs=v
def __len__(self): return len(self._subs) def __len__(self): return len(self._subs)
def append(self, v): self._subs.append(v) def append(self, v): self._subs.append(v)
def value(self, indent): def value(self, indent):
return string.join(map( return string.join(map(
lambda v, indent=indent: v.__str__(indent), lambda v, indent=indent: v.__str__(indent),
self._subs),'') self._subs),'')
class List(Sequence): pass class List(Sequence): pass
class Tuple(Sequence): pass class Tuple(Sequence): pass
...@@ -311,15 +311,15 @@ none=none() ...@@ -311,15 +311,15 @@ none=none()
class Reference(Scalar): class Reference(Scalar):
def __init__(self, v): self._v=v def __init__(self, v): self._v=v
def __str__(self, indent=0): def __str__(self, indent=0):
v=self._v v=self._v
name=string.lower(self.__class__.__name__) name=string.lower(self.__class__.__name__)
return '%s<%s id="%s"/>\n' % (' '*indent,name,v) return '%s<%s id="%s"/>\n' % (' '*indent,name,v)
Get=Reference Get=Reference
class Object(Sequence): class Object(Sequence):
def __init__(self, klass, args): def __init__(self, klass, args):
self._subs=[Klass(klass), args] self._subs=[Klass(klass), args]
def __setstate__(self, v): self.append(State(v)) def __setstate__(self, v): self.append(State(v))
...@@ -447,7 +447,7 @@ class ToXMLUnpickler(Unpickler): ...@@ -447,7 +447,7 @@ class ToXMLUnpickler(Unpickler):
dispatch.update(Unpickler.dispatch) dispatch.update(Unpickler.dispatch)
def persistent_load(self, v): def persistent_load(self, v):
return Persistent(v) return Persistent(v)
def load_persid(self): def load_persid(self):
pid = self.readline()[:-1] pid = self.readline()[:-1]
...@@ -488,7 +488,7 @@ class ToXMLUnpickler(Unpickler): ...@@ -488,7 +488,7 @@ class ToXMLUnpickler(Unpickler):
def load_string(self): def load_string(self):
self.append(String(eval(self.readline()[:-1], self.append(String(eval(self.readline()[:-1],
{'__builtins__': {}}))) # Let's be careful {'__builtins__': {}}))) # Let's be careful
dispatch[STRING] = load_string dispatch[STRING] = load_string
def load_binstring(self): def load_binstring(self):
...@@ -540,7 +540,7 @@ class ToXMLUnpickler(Unpickler): ...@@ -540,7 +540,7 @@ class ToXMLUnpickler(Unpickler):
del self.stack[k:] del self.stack[k:]
module = self.readline()[:-1] module = self.readline()[:-1]
name = self.readline()[:-1] name = self.readline()[:-1]
value=Object(Global(module, name), args) value=Object(Global(module, name), args)
self.append(value) self.append(value)
dispatch[INST] = load_inst dispatch[INST] = load_inst
...@@ -551,7 +551,7 @@ class ToXMLUnpickler(Unpickler): ...@@ -551,7 +551,7 @@ class ToXMLUnpickler(Unpickler):
del stack[k + 1] del stack[k + 1]
args = Tuple(stack[k + 1:]) args = Tuple(stack[k + 1:])
del stack[k:] del stack[k:]
value=Object(klass,args) value=Object(klass,args)
self.append(value) self.append(value)
dispatch[OBJ] = load_obj dispatch[OBJ] = load_obj
...@@ -568,7 +568,7 @@ class ToXMLUnpickler(Unpickler): ...@@ -568,7 +568,7 @@ class ToXMLUnpickler(Unpickler):
arg_tup = stack[-1] arg_tup = stack[-1]
del stack[-2:] del stack[-2:]
value=Object(callable, arg_tup) value=Object(callable, arg_tup)
self.append(value) self.append(value)
dispatch[REDUCE] = load_reduce dispatch[REDUCE] = load_reduce
...@@ -589,17 +589,17 @@ class ToXMLUnpickler(Unpickler): ...@@ -589,17 +589,17 @@ class ToXMLUnpickler(Unpickler):
dispatch[LONG_BINGET] = load_long_binget dispatch[LONG_BINGET] = load_long_binget
def load_put(self): 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 dispatch[PUT] = load_put
def load_binput(self): def load_binput(self):
i = mloads('i' + self.read(1) + '\000\000\000') 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 dispatch[BINPUT] = load_binput
def load_long_binput(self): def load_long_binput(self):
i = mloads('i' + self.read(4)) 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 dispatch[LONG_BINPUT] = load_long_binput
......
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