Skip to content

Commit b5697b6

Browse files
committed
Fixed some py2/py3 issues in ID index generation modules.
- Legacy-Id: 17262
1 parent 21a73ad commit b5697b6

4 files changed

Lines changed: 26 additions & 8 deletions

File tree

ietf/idindex/generate_all_id2_txt.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python
2-
# Copyright The IETF Trust 2010-2019, All Rights Reserved
2+
# Copyright The IETF Trust 2010-2020, All Rights Reserved
33
# -*- coding: utf-8 -*-
44
#
55
# Portions Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
@@ -39,10 +39,14 @@
3939

4040
import os
4141
import six
42+
import sys
4243
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
4344

4445
import django
4546
django.setup()
4647

4748
from ietf.idindex.index import all_id2_txt
48-
six.print_(all_id2_txt().encode('utf-8'), end=' ')
49+
if six.PY3:
50+
sys.stdout.write(all_id2_txt())
51+
else:
52+
sys.stdout.write(all_id2_txt().encode('utf-8'))

ietf/idindex/generate_all_id_txt.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python
2-
# Copyright The IETF Trust 2009-2019, All Rights Reserved
2+
# Copyright The IETF Trust 2009-2020, All Rights Reserved
33
# -*- coding: utf-8 -*-
44
# Portions Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
55
# All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
@@ -38,10 +38,14 @@
3838

3939
import os
4040
import six
41+
import sys
4142
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
4243

4344
import django
4445
django.setup()
4546

4647
from ietf.idindex.index import all_id_txt
47-
six.print_(all_id_txt().encode("utf-8"), end=' ')
48+
if six.PY3:
49+
sys.stdout.write(all_id_txt())
50+
else:
51+
sys.stdout.write(all_id_txt().encode('utf-8'))

ietf/idindex/generate_id_abstracts_txt.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python
2-
# Copyright The IETF Trust 2009-2019, All Rights Reserved
2+
# Copyright The IETF Trust 2009-2020, All Rights Reserved
33
# -*- coding: utf-8 -*-
44
# Portions Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
55
# All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
@@ -38,10 +38,15 @@
3838

3939
import os
4040
import six
41+
import sys
4142
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
4243

4344
import django
4445
django.setup()
4546

4647
from ietf.idindex.index import id_index_txt
47-
six.print_(id_index_txt(with_abstracts=True).encode('utf-8'), end=' ')
48+
if six.PY3:
49+
sys.stdout.write(id_index_txt(with_abstracts=True))
50+
else:
51+
sys.stdout.write(id_index_txt(with_abstracts=True).encode('utf-8'))
52+

ietf/idindex/generate_id_index_txt.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python
2-
# Copyright The IETF Trust 2009-2019, All Rights Reserved
2+
# Copyright The IETF Trust 2009-2020, All Rights Reserved
33
# -*- coding: utf-8 -*-
44
# Portions Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
55
# All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
@@ -38,10 +38,15 @@
3838

3939
import os
4040
import six
41+
import sys
4142
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
4243

4344
import django
4445
django.setup()
4546

4647
from ietf.idindex.index import id_index_txt
47-
six.print_(id_index_txt().encode('utf-8'), end=' ')
48+
if six.PY3:
49+
sys.stdout.write(id_index_txt())
50+
else:
51+
sys.stdout.write(id_index_txt().encode('utf-8'))
52+

0 commit comments

Comments
 (0)