From b5697b62ab3707cf151c91480c0e9ab5d7865a53 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Tue, 28 Jan 2020 13:29:54 +0000 Subject: [PATCH] Fixed some py2/py3 issues in ID index generation modules. - Legacy-Id: 17262 --- ietf/idindex/generate_all_id2_txt.py | 8 ++++++-- ietf/idindex/generate_all_id_txt.py | 8 ++++++-- ietf/idindex/generate_id_abstracts_txt.py | 9 +++++++-- ietf/idindex/generate_id_index_txt.py | 9 +++++++-- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/ietf/idindex/generate_all_id2_txt.py b/ietf/idindex/generate_all_id2_txt.py index 67fef35d2..47e379e5c 100755 --- a/ietf/idindex/generate_all_id2_txt.py +++ b/ietf/idindex/generate_all_id2_txt.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright The IETF Trust 2010-2019, All Rights Reserved +# Copyright The IETF Trust 2010-2020, All Rights Reserved # -*- coding: utf-8 -*- # # Portions Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). @@ -39,10 +39,14 @@ from __future__ import absolute_import, print_function, unicode_literals import os import six +import sys os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") import django django.setup() from ietf.idindex.index import all_id2_txt -six.print_(all_id2_txt().encode('utf-8'), end=' ') +if six.PY3: + sys.stdout.write(all_id2_txt()) +else: + sys.stdout.write(all_id2_txt().encode('utf-8')) diff --git a/ietf/idindex/generate_all_id_txt.py b/ietf/idindex/generate_all_id_txt.py index f7d805be9..dffa650c8 100755 --- a/ietf/idindex/generate_all_id_txt.py +++ b/ietf/idindex/generate_all_id_txt.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright The IETF Trust 2009-2019, All Rights Reserved +# Copyright The IETF Trust 2009-2020, All Rights Reserved # -*- coding: utf-8 -*- # Portions Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. Contact: Pasi Eronen @@ -38,10 +38,14 @@ from __future__ import absolute_import, print_function, unicode_literals import os import six +import sys os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") import django django.setup() from ietf.idindex.index import all_id_txt -six.print_(all_id_txt().encode("utf-8"), end=' ') +if six.PY3: + sys.stdout.write(all_id_txt()) +else: + sys.stdout.write(all_id_txt().encode('utf-8')) diff --git a/ietf/idindex/generate_id_abstracts_txt.py b/ietf/idindex/generate_id_abstracts_txt.py index d93b4b8a7..fce23dea0 100755 --- a/ietf/idindex/generate_id_abstracts_txt.py +++ b/ietf/idindex/generate_id_abstracts_txt.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright The IETF Trust 2009-2019, All Rights Reserved +# Copyright The IETF Trust 2009-2020, All Rights Reserved # -*- coding: utf-8 -*- # Portions Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. Contact: Pasi Eronen @@ -38,10 +38,15 @@ from __future__ import absolute_import, print_function, unicode_literals import os import six +import sys os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") import django django.setup() from ietf.idindex.index import id_index_txt -six.print_(id_index_txt(with_abstracts=True).encode('utf-8'), end=' ') +if six.PY3: + sys.stdout.write(id_index_txt(with_abstracts=True)) +else: + sys.stdout.write(id_index_txt(with_abstracts=True).encode('utf-8')) + diff --git a/ietf/idindex/generate_id_index_txt.py b/ietf/idindex/generate_id_index_txt.py index c201a9cb7..6a32ebced 100755 --- a/ietf/idindex/generate_id_index_txt.py +++ b/ietf/idindex/generate_id_index_txt.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright The IETF Trust 2009-2019, All Rights Reserved +# Copyright The IETF Trust 2009-2020, All Rights Reserved # -*- coding: utf-8 -*- # Portions Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. Contact: Pasi Eronen @@ -38,10 +38,15 @@ from __future__ import absolute_import, print_function, unicode_literals import os import six +import sys os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") import django django.setup() from ietf.idindex.index import id_index_txt -six.print_(id_index_txt().encode('utf-8'), end=' ') +if six.PY3: + sys.stdout.write(id_index_txt()) +else: + sys.stdout.write(id_index_txt().encode('utf-8')) +