Repository :
http://git.fedorahosted.org/cgit/
On branch : master
---------------------------------------------------------------
commit 2df5a89c52ad9f38c3c4e2a7e11f642eebf2f319
Author: Matt Domsch <matt(a)domsch.com>
Date: Wed Dec 18 09:48:05 2013 -0600
model: use datetime.datetime.utcnow callable for defaults
When done as a function (), this is evaluated at program start time,
not during runtime. Instead we want it evaluated at runtime, so pass
in the function name. Also make sure all are utcnow and not just
.now.
---------------------------------------------------------------
server/mirrormanager/model.py | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/mirrormanager/model.py b/server/mirrormanager/model.py
index 2fd9ed6..ee36da1 100644
--- a/server/mirrormanager/model.py
+++ b/server/mirrormanager/model.py
@@ -43,7 +43,7 @@ class Site(SQLObject):
private = BoolCol(default=False)
admin_active = BoolCol(default=True)
user_active = BoolCol(default=True)
- createdAt = DateTimeCol(default=datetime.datetime.utcnow())
+ createdAt = DateTimeCol(default=datetime.datetime.utcnow)
createdBy = UnicodeCol(default=None)
# allow all sites to pull from me
allSitesCanPullFromMe = BoolCol(default=False)
@@ -323,7 +323,7 @@ class Host(SQLObject):
def _set_config(self, config):
# really, we don't store the config anymore
self._config = None
- self.lastCheckedIn = datetime.datetime.utcnow()
+ self.lastCheckedIn = datetime.datetime.utcnow
def checkin(self, config):
message = self._uploaded_config(config)
@@ -605,7 +605,7 @@ class HostStats(SQLObject):
class sqlmeta:
cacheValues = False
host = ForeignKey('Host')
- _timestamp = DateTimeCol(default=datetime.datetime.utcnow())
+ _timestamp = DateTimeCol(default=datetime.datetime.utcnow)
type = UnicodeCol(default=None)
data = PickleCol(default=None)
@@ -988,7 +988,7 @@ class Visit(SQLObject):
visit_key = StringCol(length=40, alternateID=True,
alternateMethodName="by_visit_key")
- created = DateTimeCol(default=datetime.datetime.now)
+ created = DateTimeCol(default=datetime.datetime.utcnow)
expiry = DateTimeCol()
def lookup_visit(cls, visit_key):
@@ -1017,7 +1017,7 @@ class Group(SQLObject):
group_name = UnicodeCol(length=16, alternateID=True,
alternateMethodName="by_group_name")
display_name = UnicodeCol(length=255)
- created = DateTimeCol(default=datetime.datetime.now)
+ created = DateTimeCol(default=datetime.datetime.utcnow)
# collection of all users belonging to this group
users = RelatedJoin("User", intermediateTable="user_group",
@@ -1044,7 +1044,7 @@ class User(SQLObject):
alternateMethodName="by_email_address")
display_name = UnicodeCol(length=255)
password = UnicodeCol(length=40)
- created = DateTimeCol(default=datetime.datetime.now)
+ created = DateTimeCol(default=datetime.datetime.utcnow)
# groups this user belongs to
groups = RelatedJoin("Group", intermediateTable="user_group",