[3.7] bpo-35110: Fix unintentional spaces around hyphens and dashes. (GH-10231). (GH-10253)

(cherry picked from commit 3f819ca138db6945ee4271bf13e42db9f9b3b1e4)
33 files changed