From 2173ca7f6f5551bbd9c55ffe7b40528aaa08f99e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20=E2=80=9CKwpolska=E2=80=9D=20Warrick?= Date: Tue, 3 Jun 2014 16:31:33 +0200 Subject: [PATCH 1/4] fix #1284, fix #1313 -- fix dates in new_post MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Chris “Kwpolska” Warrick --- CHANGES.txt | 2 ++ nikola/plugins/command/new_post.py | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 0b15e731ec..d510b216ed 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -12,6 +12,8 @@ Features Bugfixes -------- +* sanitized dates generated by new_post by forcing an ISO 8601-esque + format of YYYY-mm-dd HH:MM:SS (Issues #1284, #1313) * made github_deploy compatible with Python 3 (Issue #1311) * rebuild stuff on TranslatableSettings’ change (Issue #1297) * made bootstrap-jinja and bootstrap3-jinja work again, assets were missing diff --git a/nikola/plugins/command/new_post.py b/nikola/plugins/command/new_post.py index 6ddbdb5c8f..1454671e07 100644 --- a/nikola/plugins/command/new_post.py +++ b/nikola/plugins/command/new_post.py @@ -129,16 +129,13 @@ def get_date(schedule=False, rule=None, last_date=None, tz=None, iso8601=False): offset_min = offset_sec % 3600 if iso8601: tz_str = '{0:+03d}:{1:02d}'.format(offset_hrs, offset_min // 60) - return date.strftime('%Y-%m-%dT%T') + tz_str else: if offset: tz_str = ' UTC{0:+03d}:{1:02d}'.format(offset_hrs, offset_min // 60) else: tz_str = ' UTC' - return date.strftime('{0} {1}'.format( - locale.nl_langinfo(locale.D_FMT), - locale.nl_langinfo(locale.T_FMT), - )) + tz_str + + return date.strftime('%Y-%m-%d %H:%M:%S') + tz_str class CommandNewPost(Command): From bb5f18cc320abfed091d1e8f5a74f92615dcfef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20=E2=80=9CKwpolska=E2=80=9D=20Warrick?= Date: Tue, 3 Jun 2014 16:49:06 +0200 Subject: [PATCH 2/4] =?UTF-8?q?While=20we=E2=80=99re=20at=20it,=20change?= =?UTF-8?q?=20documentation=20and=20sample=20site=20to=20reflect=20new=20d?= =?UTF-8?q?ate=20format?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Chris “Kwpolska” Warrick --- docs/creating-a-theme.txt | 2 +- docs/extending.txt | 2 +- docs/internals.txt | 2 +- docs/manual.txt | 11 +++++++---- docs/social_buttons.txt | 2 +- docs/theming.txt | 2 +- docs/upgrading-to-v6.txt | 2 +- nikola/data/samplesite/posts/1.rst | 2 +- nikola/data/samplesite/stories/1.rst | 2 +- nikola/data/samplesite/stories/a-study-in-scarlet.txt | 2 +- nikola/data/samplesite/stories/bootstrap-demo.rst | 2 +- nikola/data/samplesite/stories/charts.txt | 2 +- nikola/data/samplesite/stories/listings-demo.rst | 2 +- nikola/data/samplesite/stories/quickref.rst | 2 +- nikola/data/samplesite/stories/quickstart.rst | 2 +- nikola/data/samplesite/stories/slides-demo.rst | 2 +- 16 files changed, 22 insertions(+), 19 deletions(-) diff --git a/docs/creating-a-theme.txt b/docs/creating-a-theme.txt index 4fe94011ee..220a8e78e2 100644 --- a/docs/creating-a-theme.txt +++ b/docs/creating-a-theme.txt @@ -1,6 +1,6 @@ .. title: Creating a Theme .. slug: creating-a-theme -.. date: 2012/03/13 12:00 +.. date: 2012-03-13 12:00:00 UTC-03:00 .. tags: .. link: .. description: diff --git a/docs/extending.txt b/docs/extending.txt index 7f9177f53b..2149088c3f 100644 --- a/docs/extending.txt +++ b/docs/extending.txt @@ -1,6 +1,6 @@ .. title: Extending Nikola .. slug: extending -.. date: 2012/03/30 23:00 +.. date: 2012-03-30 23:00:00 UTC-03:00 .. tags: .. link: .. description: diff --git a/docs/internals.txt b/docs/internals.txt index 06a27477d2..a025075244 100644 --- a/docs/internals.txt +++ b/docs/internals.txt @@ -1,6 +1,6 @@ .. title: Nikola Internals .. slug: internals -.. date: 2012/03/30 23:00 +.. date: 2012-03-30 23:00:00 UTC-03:00 .. tags: .. link: .. description: diff --git a/docs/manual.txt b/docs/manual.txt index 82160c17b2..3bbbc59df3 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -1,6 +1,6 @@ .. title: The Nikola Handbook .. slug: handbook -.. date: 2012/03/30 23:00 +.. date: 2012-03-30 23:00:00 UTC-03:00 .. tags: .. link: .. description: @@ -459,7 +459,7 @@ The content of that file is as follows:: .. title: How to make money .. slug: how-to-make-money - .. date: 2012/09/15 19:52:05 + .. date: 2012-09-15 19:52:05 UTC .. tags: .. link: .. description: @@ -534,7 +534,7 @@ to your configuration:: How to make money how-to-make-money - 2012/09/15 19:52:05 + 2012-09-15 19:52:05 UTC However, starting with Nikola v7, you can now use ``.meta`` files and put all metadata you want, complete with the explanations — they look just like @@ -542,7 +542,10 @@ to your configuration:: .. title: How to make money .. slug: how-to-make-money - .. date: 2012/09/15 19:52:05 + .. date: 2012-09-15 19:52:05 UTC + + Both file formats are supported; however, the new format is preferred, if + possible. If you are writing a multilingual site, you can also create a per-language post file (for example: ``how-to-make-money.es.txt`` with the default TRANSLATIONS_PATTERN, see below). diff --git a/docs/social_buttons.txt b/docs/social_buttons.txt index 1731c9077b..d465190690 100644 --- a/docs/social_buttons.txt +++ b/docs/social_buttons.txt @@ -1,6 +1,6 @@ .. title: Alternative Social Buttons .. slug: social_buttons -.. date: 2013/08/19 23:00 +.. date: 2013-08-19 23:00:00 UTC-03:00 .. tags: .. link: .. description: diff --git a/docs/theming.txt b/docs/theming.txt index 89f70c505a..b60916567a 100644 --- a/docs/theming.txt +++ b/docs/theming.txt @@ -1,6 +1,6 @@ .. title: Theming Nikola .. slug: theming -.. date: 2012/03/13 12:00 +.. date: 2012-03-13 12:00:00 UTC-03:00 .. tags: .. link: .. description: diff --git a/docs/upgrading-to-v6.txt b/docs/upgrading-to-v6.txt index 1d28014b82..e086b0c11c 100644 --- a/docs/upgrading-to-v6.txt +++ b/docs/upgrading-to-v6.txt @@ -1,6 +1,6 @@ .. title: Upgrading to v6 .. slug: upgrading-to-v6 -.. date: 2013/08/23 23:00 +.. date: 2013-08-23 23:00:00 UTC-03:00 .. tags: .. link: .. description: diff --git a/nikola/data/samplesite/posts/1.rst b/nikola/data/samplesite/posts/1.rst index 6e47cbd9b2..7116a7a957 100644 --- a/nikola/data/samplesite/posts/1.rst +++ b/nikola/data/samplesite/posts/1.rst @@ -1,6 +1,6 @@ .. title: Welcome to Nikola .. slug: welcome-to-nikola -.. date: 2012/03/30 23:00 +.. date: 2012-03-30 23:00:00 UTC-03:00 .. tags: nikola, python, demo, blog .. author: Roberto Alsina .. link: http://getnikola.com diff --git a/nikola/data/samplesite/stories/1.rst b/nikola/data/samplesite/stories/1.rst index 27c75d86eb..b662fae617 100644 --- a/nikola/data/samplesite/stories/1.rst +++ b/nikola/data/samplesite/stories/1.rst @@ -1,6 +1,6 @@ .. title: Nikola: it generates static .. slug: about-nikola -.. date: 2012/03/30 23:00 +.. date: 2012-03-30 23:00:00 UTC-03:00 .. tags: .. link: .. description: diff --git a/nikola/data/samplesite/stories/a-study-in-scarlet.txt b/nikola/data/samplesite/stories/a-study-in-scarlet.txt index 10f952871a..2dfee525c8 100644 --- a/nikola/data/samplesite/stories/a-study-in-scarlet.txt +++ b/nikola/data/samplesite/stories/a-study-in-scarlet.txt @@ -1,7 +1,7 @@ .. link: .. description: .. tags: -.. date: 2013/08/27 18:20:55 +.. date: 2013-08-27 18:20:55 UTC-03:00 .. title: A STUDY IN SCARLET. .. slug: a-study-in-scarlet diff --git a/nikola/data/samplesite/stories/bootstrap-demo.rst b/nikola/data/samplesite/stories/bootstrap-demo.rst index 520e4b051d..a7be1a9610 100644 --- a/nikola/data/samplesite/stories/bootstrap-demo.rst +++ b/nikola/data/samplesite/stories/bootstrap-demo.rst @@ -1,6 +1,6 @@ .. title: Bootstrap Demo .. slug: bootstrap-demo -.. date: 2012/03/30 23:00 +.. date: 2012-03-30 23:00:00 UTC-03:00 .. tags: bootstrap, demo .. link: http://getnikola.com .. description: diff --git a/nikola/data/samplesite/stories/charts.txt b/nikola/data/samplesite/stories/charts.txt index 2c90fdf63e..72fedb108d 100644 --- a/nikola/data/samplesite/stories/charts.txt +++ b/nikola/data/samplesite/stories/charts.txt @@ -1,7 +1,7 @@ .. link: .. description: .. tags: -.. date: 2013/08/27 18:20:55 +.. date: 2013-08-27 18:20:55 UTC-03:00 .. title: Charts .. slug: charts diff --git a/nikola/data/samplesite/stories/listings-demo.rst b/nikola/data/samplesite/stories/listings-demo.rst index 7875f178a8..3bb8dc6bee 100644 --- a/nikola/data/samplesite/stories/listings-demo.rst +++ b/nikola/data/samplesite/stories/listings-demo.rst @@ -1,6 +1,6 @@ .. title: Listings Demo .. slug: listings-demo -.. date: 2012/12/15 10:16:20 +.. date: 2012-12-15 10:16:20 UTC-03:00 .. tags: .. link: .. description: diff --git a/nikola/data/samplesite/stories/quickref.rst b/nikola/data/samplesite/stories/quickref.rst index 52e786f896..7886cd1c0e 100644 --- a/nikola/data/samplesite/stories/quickref.rst +++ b/nikola/data/samplesite/stories/quickref.rst @@ -1,6 +1,6 @@ .. title: A reStructuredText Reference .. slug: quickref -.. date: 2012/03/30 23:00 +.. date: 2012-03-30 23:00:00 UTC-03:00 .. tags: .. link: .. description: diff --git a/nikola/data/samplesite/stories/quickstart.rst b/nikola/data/samplesite/stories/quickstart.rst index 4282b23c13..5b78807ae5 100644 --- a/nikola/data/samplesite/stories/quickstart.rst +++ b/nikola/data/samplesite/stories/quickstart.rst @@ -1,6 +1,6 @@ .. title: A reStructuredText Primer .. slug: quickstart -.. date: 2012/03/30 23:00 +.. date: 2012-03-30 23:00:00 UTC-03:00 .. tags: .. link: .. description: diff --git a/nikola/data/samplesite/stories/slides-demo.rst b/nikola/data/samplesite/stories/slides-demo.rst index fb1356b156..0d07bbc1e3 100644 --- a/nikola/data/samplesite/stories/slides-demo.rst +++ b/nikola/data/samplesite/stories/slides-demo.rst @@ -1,6 +1,6 @@ .. title: Slides Demo .. slug: slides-demo -.. date: 2012/12/27 10:16:20 +.. date: 2012-12-27 10:16:20 UTC-03:00 .. tags: .. link: .. description: From ed5ae4e22dc63283db23cd50e6ede0684e529c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20=E2=80=9CKwpolska=E2=80=9D=20Warrick?= Date: Tue, 3 Jun 2014 16:49:39 +0200 Subject: [PATCH 3/4] remove unused import MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Chris “Kwpolska” Warrick --- nikola/plugins/command/new_post.py | 1 - 1 file changed, 1 deletion(-) diff --git a/nikola/plugins/command/new_post.py b/nikola/plugins/command/new_post.py index 1454671e07..42f77cce0e 100644 --- a/nikola/plugins/command/new_post.py +++ b/nikola/plugins/command/new_post.py @@ -27,7 +27,6 @@ from __future__ import unicode_literals, print_function import codecs import datetime -import locale import os import sys import subprocess From 41c1e1f1dc1cba88200678d0a6f9dec677ad32f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20=E2=80=9CKwpolska=E2=80=9D=20Warrick?= Date: Tue, 3 Jun 2014 16:50:48 +0200 Subject: [PATCH 4/4] hardcode the new date format in a test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Chris “Kwpolska” Warrick --- tests/test_scheduling.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/test_scheduling.py b/tests/test_scheduling.py index 1fc447df16..ae1cf92c18 100644 --- a/tests/test_scheduling.py +++ b/tests/test_scheduling.py @@ -46,9 +46,7 @@ def tearDown(cls): def test_get_date(self): from nikola.plugins.command.new_post import get_date - # This is now locale-dependent, so do it here, where - # locale is set. - FMT = '{0} {1} %Z'.format( + FMT = '%Y-%m-%d %H:%M:%S %Z'.format( locale.nl_langinfo(locale.D_FMT), locale.nl_langinfo(locale.T_FMT), )