Clean up stray space at the end of a line after a period.
Merge pull request #5863 from risaacson/htpasswd_space_cleanup

Clean up stray space at the end of a line after a period.
Revert "Fix for issue 5739. The copy module does not delete directories it will only unlinks symlinks."

This reverts commit b20dc4f57862885632381c2e4264db7094d13e2f.
reword "except Error as e:" into "except Error, e:" to be compatible with Python 2.5 (#5852)