From f6724cb960920b2ec785d0a17986103d2515d433 Mon Sep 17 00:00:00 2001 From: cclauss Date: Wed, 23 Jan 2019 19:41:44 +0100 Subject: [PATCH] Simplify _input_compat and str_compat The __six__ module provides us these same constructs using different names. --- pelican/tools/pelican_quickstart.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py index 529eeb52..a97ef305 100755 --- a/pelican/tools/pelican_quickstart.py +++ b/pelican/tools/pelican_quickstart.py @@ -77,19 +77,8 @@ CONF = { # url for list of valid timezones _TZ_URL = 'http://en.wikipedia.org/wiki/List_of_tz_database_time_zones' - -def _input_compat(prompt): - if six.PY3: - r = input(prompt) - else: - r = raw_input(prompt) - return r - - -if six.PY3: - str_compat = str -else: - str_compat = unicode +_input_compat = six.moves.input +str_compat = six.text_type # Create a 'marked' default path, to determine if someone has supplied