add two important changes for 1.3/4

shutil.SameFileError; use new_backup for both copying functions