Use python3 for osmo_ctrl.py
It's a standalone script illustrating the use of ctrl protocol from python. Since it's not used as a library and nothing depends on it, we can safely switch to python3. Change-Id: I2461dd9af67771beed5306116e8a1b0ee2285aa8
This commit is contained in:
parent
6588960d1d
commit
8a02e36575
|
@ -6,7 +6,7 @@ COM_FLAGS='-m compileall'
|
||||||
|
|
||||||
# FIXME: remove once python 2 support is deprecated
|
# FIXME: remove once python 2 support is deprecated
|
||||||
PY2=python2
|
PY2=python2
|
||||||
PY2_LIST="osmopy scripts/osmo_ctrl.py scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py"
|
PY2_LIST="osmopy scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py"
|
||||||
$PY2 ./setup.py install
|
$PY2 ./setup.py install
|
||||||
$PY2 tests/test_py2.py
|
$PY2 tests/test_py2.py
|
||||||
for f in $PY2_LIST
|
for f in $PY2_LIST
|
||||||
|
@ -24,4 +24,7 @@ do
|
||||||
$PY3 $COM_FLAGS $f
|
$PY3 $COM_FLAGS $f
|
||||||
done
|
done
|
||||||
|
|
||||||
|
cd scripts
|
||||||
|
./osmo_ctrl.py --help
|
||||||
|
|
||||||
# TODO: add more tests
|
# TODO: add more tests
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
#!/usr/bin/env python2
|
#!/usr/bin/env python3
|
||||||
# -*- mode: python-mode; py-indent-tabs-mode: nil -*-
|
# -*- mode: python-mode; py-indent-tabs-mode: nil -*-
|
||||||
"""
|
"""
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2016 sysmocom s.f.m.c. GmbH
|
* Copyright (C) 2016-2017 sysmocom s.f.m.c. GmbH
|
||||||
*
|
*
|
||||||
* All Rights Reserved
|
* All Rights Reserved
|
||||||
*
|
*
|
||||||
|
@ -21,7 +21,7 @@
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
*/
|
*/
|
||||||
"""
|
"""
|
||||||
from __future__ import print_function
|
|
||||||
from optparse import OptionParser
|
from optparse import OptionParser
|
||||||
from osmopy.osmo_ipa import Ctrl
|
from osmopy.osmo_ipa import Ctrl
|
||||||
import socket
|
import socket
|
||||||
|
|
1
setup.py
1
setup.py
|
@ -25,6 +25,7 @@ if sys.version_info.major == 2:
|
||||||
elif sys.version_info.major == 3:
|
elif sys.version_info.major == 3:
|
||||||
scripts = ["scripts/osmo_interact_vty.py",
|
scripts = ["scripts/osmo_interact_vty.py",
|
||||||
"scripts/osmo_interact_ctrl.py",
|
"scripts/osmo_interact_ctrl.py",
|
||||||
|
"scripts/osmo_ctrl.py",
|
||||||
"scripts/soap.py",
|
"scripts/soap.py",
|
||||||
"scripts/twisted_ipa.py",
|
"scripts/twisted_ipa.py",
|
||||||
"scripts/osmo_verify_transcript_vty.py",
|
"scripts/osmo_verify_transcript_vty.py",
|
||||||
|
|
Loading…
Reference in New Issue