minor clean-up: remove obsolete comments and duplicate code

This commit is contained in:
Helmut Merz 2011-12-04 11:41:53 +01:00
parent 0d4019de74
commit d6c1ec466c

View file

@ -332,10 +332,6 @@ class RelationSet(object):
def __init__(self, context, predicateName, interface=None, noSecurityCheck=False): def __init__(self, context, predicateName, interface=None, noSecurityCheck=False):
self.adapted = context self.adapted = context
self.context = baseObject(context) self.context = baseObject(context)
#if isinstance(context, AdapterBase):
# self.context = context.context
#else:
# self.context = context
self.predicateName = predicateName self.predicateName = predicateName
self.interface = interface self.interface = interface
self.noSecurityCheck = noSecurityCheck self.noSecurityCheck = noSecurityCheck
@ -396,8 +392,7 @@ class ChildRelationSet(RelationSet):
self.context.assignChild(related, self.predicate, order, relevance) self.context.assignChild(related, self.predicate, order, relevance)
def remove(self, related): def remove(self, related):
if isinstance(related, AdapterBase): related = baseObject(related.context)
related = related.context
self.context.deassignChild(related, [self.predicate]) self.context.deassignChild(related, [self.predicate])
def __iter__(self): def __iter__(self):
@ -530,42 +525,6 @@ class Tracks(object):
return track return track
# records/tracks
class Tracks(object):
""" A tracking storage adapter managing tracks/records.
"""
implements(ITracks)
adapts(ITrackingStorage)
def __init__(self, context):
self.context = context
def __getitem__(self, key):
return self.context[key]
def __iter__(self):
return iter(self.context.values())
def query(self, **criteria):
if 'task' in criteria:
criteria['taskId'] = criteria.pop('task')
if 'party' in criteria:
criteria['userName'] = criteria.pop('party')
if 'run' in criteria:
criteria['runId'] = criteria.pop('run')
return self.context.query(**criteria)
def add(self, task, userName, run=0, **kw):
if not run:
run = self.context.startRun()
trackId = self.context.saveUserTrack(task, run, userName, {})
track = self[trackId]
track.setData(**kw)
return track
# caching (TBD) # caching (TBD)
def cached(obj): def cached(obj):