浏览代码

Merge branch 'master' of github.com:tracim/tracim

Bastien Sevajol (Algoo) 8 年前
父节点
当前提交
5245ccead6
共有 3 个文件被更改,包括 12 次插入10 次删除
  1. 2 2
      tracim/tracim/model/auth.py
  2. 5 5
      tracim/tracim/model/data.py
  3. 5 3
      tracim/tracim/model/serializers.py

+ 2 - 2
tracim/tracim/model/auth.py 查看文件

68
     group_id = Column(Integer, Sequence('seq__groups__group_id'), autoincrement=True, primary_key=True)
68
     group_id = Column(Integer, Sequence('seq__groups__group_id'), autoincrement=True, primary_key=True)
69
     group_name = Column(Unicode(16), unique=True, nullable=False)
69
     group_name = Column(Unicode(16), unique=True, nullable=False)
70
     display_name = Column(Unicode(255))
70
     display_name = Column(Unicode(255))
71
-    created = Column(DateTime, default=datetime.now)
71
+    created = Column(DateTime, default=datetime.utcnow)
72
 
72
 
73
     users = relationship('User', secondary=user_group_table, backref='groups')
73
     users = relationship('User', secondary=user_group_table, backref='groups')
74
 
74
 
121
     email = Column(Unicode(255), unique=True, nullable=False)
121
     email = Column(Unicode(255), unique=True, nullable=False)
122
     display_name = Column(Unicode(255))
122
     display_name = Column(Unicode(255))
123
     _password = Column('password', Unicode(128))
123
     _password = Column('password', Unicode(128))
124
-    created = Column(DateTime, default=datetime.now)
124
+    created = Column(DateTime, default=datetime.utcnow)
125
     is_active = Column(Boolean, default=True, nullable=False)
125
     is_active = Column(Boolean, default=True, nullable=False)
126
     imported_from = Column(Unicode(32), nullable=True)
126
     imported_from = Column(Unicode(32), nullable=True)
127
     _webdav_left_digest_response_hash = Column('webdav_left_digest_response_hash', Unicode(128))
127
     _webdav_left_digest_response_hash = Column('webdav_left_digest_response_hash', Unicode(128))

+ 5 - 5
tracim/tracim/model/data.py 查看文件

580
             column_value = getattr(revision, column_name)
580
             column_value = getattr(revision, column_name)
581
             setattr(new_rev, column_name, column_value)
581
             setattr(new_rev, column_name, column_value)
582
 
582
 
583
-        new_rev.updated = datetime.now()
583
+        new_rev.updated = datetime.utcnow()
584
 
584
 
585
         return new_rev
585
         return new_rev
586
 
586
 
1009
 
1009
 
1010
     def created_as_delta(self, delta_from_datetime:datetime=None):
1010
     def created_as_delta(self, delta_from_datetime:datetime=None):
1011
         if not delta_from_datetime:
1011
         if not delta_from_datetime:
1012
-            delta_from_datetime = datetime.now()
1012
+            delta_from_datetime = datetime.utcnow()
1013
 
1013
 
1014
         return format_timedelta(delta_from_datetime - self.created,
1014
         return format_timedelta(delta_from_datetime - self.created,
1015
                                 locale=tg.i18n.get_lang()[0])
1015
                                 locale=tg.i18n.get_lang()[0])
1017
     def datetime_as_delta(self, datetime_object,
1017
     def datetime_as_delta(self, datetime_object,
1018
                           delta_from_datetime:datetime=None):
1018
                           delta_from_datetime:datetime=None):
1019
         if not delta_from_datetime:
1019
         if not delta_from_datetime:
1020
-            delta_from_datetime = datetime.now()
1020
+            delta_from_datetime = datetime.utcnow()
1021
         return format_timedelta(delta_from_datetime - datetime_object,
1021
         return format_timedelta(delta_from_datetime - datetime_object,
1022
                                 locale=tg.i18n.get_lang()[0])
1022
                                 locale=tg.i18n.get_lang()[0])
1023
 
1023
 
1232
 
1232
 
1233
     def created_as_delta(self, delta_from_datetime:datetime=None):
1233
     def created_as_delta(self, delta_from_datetime:datetime=None):
1234
         if not delta_from_datetime:
1234
         if not delta_from_datetime:
1235
-            delta_from_datetime = datetime.now()
1235
+            delta_from_datetime = datetime.utcnow()
1236
         return format_timedelta(delta_from_datetime - self.created,
1236
         return format_timedelta(delta_from_datetime - self.created,
1237
                                 locale=tg.i18n.get_lang()[0])
1237
                                 locale=tg.i18n.get_lang()[0])
1238
 
1238
 
1240
         aff = ''
1240
         aff = ''
1241
 
1241
 
1242
         if not delta_from_datetime:
1242
         if not delta_from_datetime:
1243
-            delta_from_datetime = datetime.now()
1243
+            delta_from_datetime = datetime.utcnow()
1244
 
1244
 
1245
         delta = delta_from_datetime - self.created
1245
         delta = delta_from_datetime - self.created
1246
         
1246
         

+ 5 - 3
tracim/tracim/model/serializers.py 查看文件

621
     last_activity_date = content.get_last_activity_date()
621
     last_activity_date = content.get_last_activity_date()
622
     last_activity_date_formatted = format_datetime(last_activity_date,
622
     last_activity_date_formatted = format_datetime(last_activity_date,
623
                                                    locale=tg.i18n.get_lang()[0])
623
                                                    locale=tg.i18n.get_lang()[0])
624
-    last_activity_label = format_timedelta(datetime.now() - last_activity_date,
625
-                                           locale=tg.i18n.get_lang()[0])
624
+    last_activity_label = format_timedelta(
625
+        datetime.utcnow() - last_activity_date,
626
+        locale=tg.i18n.get_lang()[0],
627
+    )
626
     last_activity_label = last_activity_label.replace(' ', '\u00A0') # espace insécable
628
     last_activity_label = last_activity_label.replace(' ', '\u00A0') # espace insécable
627
 
629
 
628
     return DictLikeClass(
630
     return DictLikeClass(
645
     last_activity_date = content.get_last_activity_date()
647
     last_activity_date = content.get_last_activity_date()
646
     last_activity_date_formatted = format_datetime(last_activity_date,
648
     last_activity_date_formatted = format_datetime(last_activity_date,
647
                                                    locale=tg.i18n.get_lang()[0])
649
                                                    locale=tg.i18n.get_lang()[0])
648
-    last_activity_label = format_timedelta(datetime.now() - last_activity_date,
650
+    last_activity_label = format_timedelta(datetime.utcnow() - last_activity_date,
649
                                            locale=tg.i18n.get_lang()[0])
651
                                            locale=tg.i18n.get_lang()[0])
650
     last_activity_label = last_activity_label.replace(' ', '\u00A0') # espace insécable
652
     last_activity_label = last_activity_label.replace(' ', '\u00A0') # espace insécable
651
 
653