diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2019-12-04 11:18:44 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2019-12-05 13:41:38 +0100 |
| commit | fb1dc7c405f6114687338382149bfc775597935a (patch) | |
| tree | 1938ea2067c351e0db3a87b672144f0796043ddd /osmopy/osmo_interact | |
| parent | fb4b813d4df62b7b2445bdced961eb1847267eed (diff) | |
Drop python2 support
Remove all compatibility code for python2.
All scripts are already python 3 compatible since
I80e5850a8978d78cda793e2192ef4bd3fd54a121 and
I1b4a629f12863c498a8681b555f57b4e255cebfb.
dpkg-buildpackage shows that it is still invoking setup.py with python
in addition to python3, on debian stretch. But after spending quite some
time on trying to convince it to not care about python2 without success
(trying different variables, overrides, --without python2 flags etc.),
I'm leaving it as is. The resulting package is the python3 package, which
is what we want.
Related: OS#2819
Change-Id: Iabda95073faa2191fd117e9637e0858c589e9d9e
Diffstat (limited to 'osmopy/osmo_interact')
| -rw-r--r-- | osmopy/osmo_interact/__init__.py | 2 | ||||
| -rw-r--r-- | osmopy/osmo_interact/common.py | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/osmopy/osmo_interact/__init__.py b/osmopy/osmo_interact/__init__.py index 4fc4fac..036238a 100644 --- a/osmopy/osmo_interact/__init__.py +++ b/osmopy/osmo_interact/__init__.py @@ -1,2 +1,2 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 __all__ = ['common', 'vty', 'ctrl'] diff --git a/osmopy/osmo_interact/common.py b/osmopy/osmo_interact/common.py index cc7e190..87eca6a 100644 --- a/osmopy/osmo_interact/common.py +++ b/osmopy/osmo_interact/common.py @@ -24,11 +24,6 @@ This implements all of application interaction, piping and verification. vty.py and ctrl.py plug VTY and CTRL interface specific bits. ''' -# Our setup.py currently wants everything to be parsable by both py2 and py3. -# IMHO that is not a good idea, but until that changes, let's just keep this -# py2 legacy shim in here so we can syntax-check this py3 module with py2. -from __future__ import print_function - import argparse import sys import os |