cli: Re-add basic Python 2 support
cli: Re-add basic Python 2 support

For the sake of running the NIPAP test suite, some basic Python 2
support is needed in the CLI modules.

bbaja42/NIPAP,SpriteLink/NIPAP,fredsod/NIPAP,fredsod/NIPAP,bbaja42/NIPAP,bbaja42/NIPAP,garberg/NIPAP,SpriteLink/NIPAP,SpriteLink/NIPAP,garberg/NIPAP,bbaja42/NIPAP,garberg/NIPAP,fredsod/NIPAP,bbaja42/NIPAP,garberg/NIPAP,SpriteLink/NIPAP,fredsod/NIPAP,fredsod/NIPAP,fredsod/NIPAP,SpriteLink/NIPAP,bbaja42/NIPAP,garberg/NIPAP,SpriteLink/NIPAP,garberg/NIPAP