Simplify more leftover Python 2 UNICODE macro checks
#2717
Merged
Loading
UNICODE macro checks
#2717