[MERGED] python/osmo-python-tests[master]: Use python3 for osmo_ctrl.py

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: Use python3 for osmo_ctrl.py
......................................................................


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
---
M contrib/jenkins.sh
M scripts/osmo_ctrl.py
M setup.py
3 files changed, 8 insertions(+), 4 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index c4ddf7d..d18b19d 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -6,7 +6,7 @@
 
 # FIXME: remove once python 2 support is deprecated
 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 tests/test_py2.py
 for f in $PY2_LIST
@@ -24,4 +24,7 @@
     $PY3 $COM_FLAGS $f
 done
 
+cd scripts
+./osmo_ctrl.py --help
+
 # TODO: add more tests
diff --git a/scripts/osmo_ctrl.py b/scripts/osmo_ctrl.py
index bec6d1d..8c0608f 100755
--- a/scripts/osmo_ctrl.py
+++ b/scripts/osmo_ctrl.py
@@ -1,8 +1,8 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # -*- 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
  *
@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 """
-from __future__ import print_function
+
 from optparse import OptionParser
 from osmopy.osmo_ipa import Ctrl
 import socket
diff --git a/setup.py b/setup.py
index 533272e..bab9c38 100755
--- a/setup.py
+++ b/setup.py
@@ -25,6 +25,7 @@
 elif sys.version_info.major == 3:
 	scripts = ["scripts/osmo_interact_vty.py",
 		   "scripts/osmo_interact_ctrl.py",
+                   "scripts/osmo_ctrl.py",
 		   "scripts/soap.py",
 		   "scripts/twisted_ipa.py",
 		   "scripts/osmo_verify_transcript_vty.py",

-- 
To view, visit https://gerrit.osmocom.org/5061
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2461dd9af67771beed5306116e8a1b0ee2285aa8
Gerrit-PatchSet: 5
Gerrit-Project: python/osmo-python-tests
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: lynxis lazus <lynxis at fe80.eu>