From fc308b18d0ff47017b790cd8f45b4b16ccf0c74f Mon Sep 17 00:00:00 2001 From: Marcin Lulek Date: Mon, 14 Sep 2015 08:50:09 +0200 Subject: [PATCH] dates: change disctance_of_time_in_words in docs to mirror pull request --- docs/blog_models_and_views.rst | 4 ++-- docs/blog_models_and_views_src.rst | 4 ++-- pyramid_blogr/models/blog_record.py | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/blog_models_and_views.rst b/docs/blog_models_and_views.rst index 3428c79..ab63f53 100644 --- a/docs/blog_models_and_views.rst +++ b/docs/blog_models_and_views.rst @@ -88,7 +88,7 @@ Your project structure should look like this at this point:: Now it is time to add imports and properties to **models/blog_record.py**:: from webhelpers2.text import urlify #<- will generate slugs - from webhelpers2.date import time_ago_in_words #<- human friendly dates + from webhelpers2.date import distance_of_time_in_words #<- human friendly dates And to model itself:: @@ -104,7 +104,7 @@ be approximated to their closest counterparts. @property def created_in_words(self): - return time_ago_in_words(self.created) + return distance_of_time_in_words(self.created, datetime.datetime.utcnow()) This property will return information when specific entry was created in a friendly form like "2 days ago". diff --git a/docs/blog_models_and_views_src.rst b/docs/blog_models_and_views_src.rst index d64225f..8f2704a 100644 --- a/docs/blog_models_and_views_src.rst +++ b/docs/blog_models_and_views_src.rst @@ -45,7 +45,7 @@ Contents of models/blog_record.py:: DateTime #<- time abstraction field, ) from webhelpers2.text import urlify #<- will generate slugs - from webhelpers2.date import time_ago_in_words #<- human friendly dates + from webhelpers2.date import distance_of_time_in_words #<- human friendly dates class BlogRecord(Base): __tablename__ = 'entries' @@ -61,7 +61,7 @@ Contents of models/blog_record.py:: @property def created_in_words(self): - return time_ago_in_words(self.created) + return distance_of_time_in_words(self.created, datetime.datetime.utcnow()) diff --git a/pyramid_blogr/models/blog_record.py b/pyramid_blogr/models/blog_record.py index fb7aac9..bddb5ef 100644 --- a/pyramid_blogr/models/blog_record.py +++ b/pyramid_blogr/models/blog_record.py @@ -24,6 +24,4 @@ def slug(self): @property def created_in_words(self): - # Can't use time_ago_in_words(self.created) since self.created - # is UTC, but that function compares against local time return distance_of_time_in_words(self.created, datetime.datetime.utcnow())