first pass at removing all python2 specific dependencies, updating python requirements.txt/setup.py/Pipfiles/Makefiles, and removing python2 compat imports

This commit is contained in:
Blake Harnden 2019-10-17 14:52:31 -07:00
parent 5d5ffb70c2
commit 6edd6a7fdb
13 changed files with 89 additions and 143 deletions

View file

@ -7,7 +7,6 @@ import os
from builtins import int
from lxml import etree
from past.builtins import basestring
from core.config import ConfigGroup
from core.emane import emanemanifest, emanemodel
@ -26,7 +25,7 @@ def convert_none(x):
"""
Helper to use 0 for None values.
"""
if isinstance(x, basestring):
if isinstance(x, str):
x = float(x)
if x is None:
return 0