Use os.walk() to remove empty directories

Use os.walk() to remove empty directories #7579