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 /geo-replication/tests/unit | |
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 'geo-replication/tests/unit')
-rw-r--r-- | geo-replication/tests/unit/__init__.py | 2 | ||||
-rw-r--r-- | geo-replication/tests/unit/test_gsyncdstatus.py | 2 | ||||
-rw-r--r-- | geo-replication/tests/unit/test_syncdutils.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/geo-replication/tests/unit/__init__.py b/geo-replication/tests/unit/__init__.py index 23adbfa5171..13065ca3d3c 100644 --- a/geo-replication/tests/unit/__init__.py +++ b/geo-replication/tests/unit/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 # # Copyright (c) 2011-2014 Red Hat, Inc. <http://www.redhat.com> # This file is part of GlusterFS. diff --git a/geo-replication/tests/unit/test_gsyncdstatus.py b/geo-replication/tests/unit/test_gsyncdstatus.py index a65d659e356..b4ce8fa053b 100644 --- a/geo-replication/tests/unit/test_gsyncdstatus.py +++ b/geo-replication/tests/unit/test_gsyncdstatus.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 # # Copyright (c) 2011-2014 Red Hat, Inc. <http://www.redhat.com> # This file is part of GlusterFS. diff --git a/geo-replication/tests/unit/test_syncdutils.py b/geo-replication/tests/unit/test_syncdutils.py index 736ae274b85..fe439a50b38 100644 --- a/geo-replication/tests/unit/test_syncdutils.py +++ b/geo-replication/tests/unit/test_syncdutils.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 # # Copyright (c) 2011-2014 Red Hat, Inc. <http://www.redhat.com> # This file is part of GlusterFS. |