Fix str/bytes handling for Python 2.x