diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2018-03-28 10:14:39 -0400 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2018-04-12 11:04:27 +0000 |
| commit | 29024cfdd5f131c7e3085cbddf9bd1cf60359960 (patch) | |
| tree | dde994fdd25f742ac335ed8e20c1823b0a843694 /events | |
| parent | c4251edec654b4e0127577e004923d9729bc323d (diff) | |
core/build/various: python3 compat, prepare for python2 -> python3
Note 1) we're not supposed to be using #!/usr/bin/env python, see
https://fedoraproject.org/wiki/Packaging:Guidelines?rd=Packaging/Guidelines#Shebang_lines
Note 2) we're also not supposed to be using "!/usr/bin/python,
see https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build#Quick_Opt-Out
The previous patch (https://review.gluster.org/19767) tried to do too
much in one patch, so it was abandoned.
This patch does two things:
1) minor cleanup of configure(.ac) to explicitly use python2
2) change all the shebang lines to #!/usr/bin/python2 and add them
where they were missing based on warnings emitted during rpmbuild.
In a follow-up patch python2 will eventually be changed to python3.
Before that python2-isms (e.g. print, string.join(), etc.) need to be
converted to python3. Some of those can be rewritten in version agnostic
python. E.g. print statements become print() with "from __future_ import
print_function". The python 2to3 utility will be used for some of those.
Also Aravinda has given guidance in the comments to the first patch for
changes.
updates: #411
Change-Id: I471730962b2526022115a1fc33629fb078b74338
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'events')
| -rw-r--r-- | events/eventskeygen.py | 2 | ||||
| -rw-r--r-- | events/src/gf_event.py | 2 | ||||
| -rw-r--r-- | events/src/glustereventsd.py | 2 | ||||
| -rw-r--r-- | events/src/peer_eventsapi.py | 2 | ||||
| -rw-r--r-- | events/tools/eventsdash.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/events/eventskeygen.py b/events/eventskeygen.py index 98c26dcbcb1..3badc05f359 100644 --- a/events/eventskeygen.py +++ b/events/eventskeygen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 # -*- coding: utf-8 -*- # # Copyright (c) 2016 Red Hat, Inc. <http://www.redhat.com> diff --git a/events/src/gf_event.py b/events/src/gf_event.py index f9ece6adc28..fd272434242 100644 --- a/events/src/gf_event.py +++ b/events/src/gf_event.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 # -*- coding: utf-8 -*- # # Copyright (c) 2016 Red Hat, Inc. <http://www.redhat.com> diff --git a/events/src/glustereventsd.py b/events/src/glustereventsd.py index 606b89cbd7f..32fb6c52aa9 100644 --- a/events/src/glustereventsd.py +++ b/events/src/glustereventsd.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 # -*- coding: utf-8 -*- # # Copyright (c) 2016 Red Hat, Inc. <http://www.redhat.com> diff --git a/events/src/peer_eventsapi.py b/events/src/peer_eventsapi.py index d72fdbe99c4..fb11e12deb4 100644 --- a/events/src/peer_eventsapi.py +++ b/events/src/peer_eventsapi.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 # -*- coding: utf-8 -*- # # Copyright (c) 2016 Red Hat, Inc. <http://www.redhat.com> diff --git a/events/tools/eventsdash.py b/events/tools/eventsdash.py index 47fc56dda6e..dc03a61983f 100644 --- a/events/tools/eventsdash.py +++ b/events/tools/eventsdash.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 # -*- coding: utf-8 -*- # # Copyright (c) 2016 Red Hat, Inc. <http://www.redhat.com> |