Merge pull request #2522 from cclauss/patch-1

Simplify _input_compat and str_compat
This commit is contained in:
Justin Mayer 2019-01-24 17:35:40 +01:00 committed by GitHub
commit 071f4756c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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