This commit complements the removal of pycompat PY2 helpers and shims from base by removing / adapting references to these helpers from the enterprise code.
This commit complements the removal of pycompat PY2 helpers and shims from base by removing / adapting references to these helpers from the enterprise code.