cco/cybertools
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make default argument 'data' foolproof

Browse source 
git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@3711 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
helmutm 2010-02-04 11:11:22 +00:00
parent 6cb702924e
commit f2b76feaf9
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tracking/btree.py
View file

@ -1,5 +1,5 @@
# #
# Copyright (c) 2009 Helmut Merz helmutm@cy55.de # Copyright (c) 2010 Helmut Merz helmutm@cy55.de
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -70,11 +70,13 @@ class Track(Persistent):
indexdata = metadata indexdata = metadata
def __init__(self, taskId, runId, userName, data={}): def __init__(self, taskId, runId, userName, data=None):
self.taskId = taskId self.taskId = taskId
self.runId = runId self.runId = runId
self.userName = userName self.userName = userName
self.timeStamp = getTimeStamp() self.timeStamp = getTimeStamp()
if data is None:
data = {}
self.data = data self.data = data
#def getName(self): #def getName(self):
@ -281,7 +283,6 @@ class TrackingStorage(BTreeContainer):
start, end = value start, end = value
result = self.intersect(result, result = self.intersect(result,
self.indexes['timeStamp'].apply((start, end))) self.indexes['timeStamp'].apply((start, end)))
#return result and [self[self.idFromNum(r)] for r in result] or set()
return result and (self[self.idFromNum(r)] for r in result) or set() return result and (self[self.idFromNum(r)] for r in result) or set()
def intersect(self, r1, r2): def intersect(self, r1, r2):
@ -297,13 +298,6 @@ class TrackingStorage(BTreeContainer):
return self.taskUsers.keys() return self.taskUsers.keys()
#def timeStamp2ISO(ts):
# return time.strftime('%Y-%m-%d %H:%M', time.gmtime(ts))
#def getTimeStamp():
# return int(time.time())
@adapter(ITrack, IObjectRemovedEvent) @adapter(ITrack, IObjectRemovedEvent)
def unindexTrack(context, event): def unindexTrack(context, event):
getParent(context).unindexTrack(int(context.__name__), context) getParent(context).unindexTrack(int(context.__name__), context)