Can You Name this Classic Movie?

I'm trying to find the title of a movie I once saw on Turner Classic Movies.

It's definitely an older movie, and it takes place in Japan where the World Olympics are being held.

Due to a shortage of hotels, 3 unrelated people, 2 men and 1 woman end up as roommates in a single apartment. One of the men was definitely american, I forget if the other man was american or if he was british and happened to have an american cousin. I only saw bits and snippets but I think it was a comedy and a spy may have been involved.

There are two identifying scenes that I remember that my help:

The first is where the woman unknowingly locks the 1st man out (because she believes in keeping the door locked for safety) while he is fetching the bottle of milk laid by the front door. He tries knocking but she is in the bathroom and cant hear him so he climbs out onto a ledge and over to her balcony window to get back inside, much to the amusement of the Japanese people watching below.

The Second takes place during some kind of social event for participants of the Olympics. A particularly hefty woman is dancing rather close to one of the Main male characters, and her rear-end is invading his personal space. Upon asking another gentlemen, he learns that her event is the shot-put, and so he asks her if she would mind putting her "Shot" somewhere else.

I'm sorry I don't have anymore helpful information, the only other thing I can think to add is that this movie may have come out anywhere between 1934 and 1972. I know that doesn't narrow it down much.

But I would really appreciate it if anyone could tell me the name of this movie. I'd like to see the entire thing.

Thank you.