Use os.path for consistency