mirror of
https://github.com/openvswitch/ovs
synced 2025-09-05 16:55:42 +00:00
1ca0323e7c
Python 2 reaches end-of-life on January 1, 2020, which is only a few months away. This means that OVS needs to stop depending on in the next release that should occur roughly that same time. Therefore, this commit removes all support for Python 2. It also makes Python 3 a mandatory build dependency. Some of the interesting consequences: - HAVE_PYTHON, HAVE_PYTHON2, and HAVE_PYTHON3 conditionals have been removed, since we now know that Python3 is available. - $PYTHON and $PYTHON2 are removed, and $PYTHON3 is always available. - Many tests for Python 2 support have been removed, and the ones that depended on Python 3 now run unconditionally. This allowed several macros in the testsuite to be removed, making the code clearer. This does make some of the changes to the testsuite files large due to indentation level changes. - #! lines for Python now use /usr/bin/python3 instead of /usr/bin/python. - Packaging depends on Python 3 packages. Acked-by: Numan Siddique <nusiddiq@redhat.com> Tested-by: Numan Siddique <nusiddiq@redhat.com> Signed-off-by: Ben Pfaff <blp@ovn.org>
60 lines
1.7 KiB
Python
Executable File
60 lines
1.7 KiB
Python
Executable File
#! /usr/bin/env python3
|
|
|
|
# Copyright (c) 2008, 2017 Nicira, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at:
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
from build import soutil
|
|
import sys
|
|
|
|
|
|
def soexpand(include_dirs, src, dst):
|
|
ok = True
|
|
while True:
|
|
line = src.readline()
|
|
if not line:
|
|
break
|
|
|
|
name = soutil.extract_include_directive(line)
|
|
if name:
|
|
fn = soutil.find_file(include_dirs, name)
|
|
if fn:
|
|
try:
|
|
f = open(fn)
|
|
while True:
|
|
inner = f.readline()
|
|
if not inner:
|
|
break
|
|
dst.write(inner)
|
|
except IOError as e:
|
|
sys.stderr.write("%s: open: %s\n" % (fn, e.strerror))
|
|
ok = False
|
|
continue
|
|
else:
|
|
ok = False
|
|
|
|
dst.write(line)
|
|
return ok
|
|
|
|
|
|
if __name__ == '__main__':
|
|
include_dirs, args = soutil.parse_include_dirs()
|
|
if args:
|
|
error = False
|
|
for arg in args:
|
|
if not soexpand(include_dirs, open(arg), sys.stdout):
|
|
error = True
|
|
else:
|
|
error = not soexpand(include_dirs, sys.stdin, sys.stdout)
|
|
sys.exit(1 if error else 0)
|