From fb1dc7c405f6114687338382149bfc775597935a Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 4 Dec 2019 11:18:44 +0100 Subject: 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 --- osmopy/osmo_interact/__init__.py | 2 +- osmopy/osmo_interact/common.py | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'osmopy/osmo_interact') 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 -- cgit v1.2.3