Mercurial Repository: p/roundup/code: roundup/support.py comparison

comparison roundup/support.py @ 3635:53987aa153d2

Transitive-property support. - Fixed some of the pet-peeves from pep8 - Better parameter names for new _subselect method - use new-style class for support.Proptree but needed a new-style class for the property I introduced anyway. - Fix a bug where searching did the wrong thing (interestingly enough the same wrong thing for all backends): A search for {'messages': ['1'], 'messages.author': ['2']} would ignore the 'messages' part (messages being non-leaf node in proptree). Fixed and added a regression test for this. - Added the transitive searching to the SearchAction. New method get_transitive_prop introduced in hyperdb that does the transitive version of getprops()[name]. Fixed two tests to use the (faked) method instead of getprop. Now searching for transitive props via the web-interface works for me. Thanks to alexander smishlajev for pointing me at the coding style. Sorry for stepping on the peeves -- I'm using a different coding style in most other projects I'm doing ...

author	Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
date	Thu, 13 Jul 2006 10:14:56 +0000
parents	57c66056ffe4
children	fa7becc62534

comparison

equal deleted inserted replaced

-:57c66056ffe4
+:53987aa153d2
 __docformat__ = 'restructuredtext'
 import os, time, sys
 import hyperdb
+from sets import Set
 class TruthDict:
 '''Returns True for valid keys, False for others.
 '''
 def __init__(self, keys):
 Currently only implements method 'append' and iteration from a
 full list interface.
 Implementation: We manage a "sorted" status and sort on demand.
 Appending to the list will require re-sorting before use.
->>> p = PrioList ()
+>>> p = PrioList()
->>> for i in 5,7,1,-1 :
+>>> for i in 5,7,1,-1:
-...  p.append (i)
+...  p.append(i)
 ...
->>> for k in p :
+>>> for k in p:
 ...  print k
 ...
 -1
 1
 5
 def __init__(self):
 self.list   = []
 self.sorted = True
 def append(self, item):
-self.list.append (item)
+self.list.append(item)
 self.sorted = False
 def __iter__(self):
-if not self.sorted :
+if not self.sorted:
-self.list.sort ()
+self.list.sort()
 self.sorted = True
-return iter (self.list)
+return iter(self.list)
 class Progress:
 '''Progress display for console applications.
 See __main__ block at end of file for sample usage.
 else:
 s = '%s %d done'%(self.info, self.num)
 sys.stdout.write(s + ' '*(75-len(s)) + '\r')
 sys.stdout.flush()
-class Proptree :
+class Proptree(object):
 ''' Simple tree data structure for optimizing searching of properties
 '''
-def __init__ (self, db, cls, name, props, parent = None, val = None) :
+def __init__(self, db, cls, name, props, parent = None, val = None):
-self.db        = db
+self.db = db
-self.name      = name
+self.name = name
-self.props     = props
+self.props = props
-self.parent    = parent
+self.parent = parent
-self.val       = val
+self._val = val
-self.cls       = cls
+self.cls = cls
 self.classname = None
-self.uniqname  = None
+self.uniqname = None
-self.children  = []
+self.children = []
 self.propnames = {}
-if parent :
+if parent:
-self.root  = parent.root
+self.root = parent.root
 self.prcls = self.parent.props [name]
-else :
+else:
-self.root  = self
+self.root = self
 self.seqno = 1
 self.id = self.root.seqno
 self.root.seqno += 1
-if self.cls :
+if self.cls:
 self.classname = self.cls.classname
-self.uniqname  = '%s%s' % (self.cls.classname, self.id)
+self.uniqname = '%s%s' % (self.cls.classname, self.id)
-if not self.parent :
+if not self.parent:
-self.uniqname  = self.cls.classname
+self.uniqname = self.cls.classname
-def append (self, name) :
+def append(self, name):
-if name in self.propnames :
+"""Append a property to self.children. Will create a new
+propclass for the child.
+"""
+if name in self.propnames:
 return self.propnames [name]
 propclass = self.props [name]
-cls   = None
+cls = None
 props = None
-if isinstance (propclass, (hyperdb.Link, hyperdb.Multilink)) :
+if isinstance(propclass, (hyperdb.Link, hyperdb.Multilink)):
-cls   = self.db.getclass (propclass.classname)
+cls = self.db.getclass(propclass.classname)
-props = cls.getprops ()
+props = cls.getprops()
-child = self.__class__ (self.db, cls, name, props, parent = self)
+child = self.__class__(self.db, cls, name, props, parent = self)
-self.children.append (child)
+self.children.append(child)
 self.propnames [name] = child
 return child
-def __iter__ (self) :
+def _set_val(self, val):
+"""Check if self._val is already defined. If yes, we compute the
+intersection of the old and the new value(s)
+"""
+if self._val:
+v = self._val
+if not isinstance(self._val, type([])):
+v = [self._val]
+vals = Set(v)
+vals.intersection_update(val)
+self._val = [v for v in vals]
+else:
+self._val = val
+val = property(lambda self: self._val, _set_val)
+def __iter__(self):
 """ Yield nodes in depth-first order -- visited nodes first """
-for p in self.children :
+for p in self.children:
 yield p
-for c in p :
+for c in p:
 yield c
 # vim: set et sts=4 sw=4 :

Mercurial > p > roundup > code

comparison roundup/support.py @ 3635:53987aa153d2