#18741: merge with 3.3.

This commit is contained in:
Ezio Melotti 2013-08-17 16:13:22 +03:00
commit e0c69161bc
22 changed files with 38 additions and 36 deletions

View file

@ -252,7 +252,7 @@ def unload(name):
if sys.platform.startswith("win"):
def _waitfor(func, pathname, waitall=False):
# Peform the operation
# Perform the operation
func(pathname)
# Now setup the wait loop
if waitall:
@ -268,7 +268,7 @@ if sys.platform.startswith("win"):
# required when contention occurs.
timeout = 0.001
while timeout < 1.0:
# Note we are only testing for the existance of the file(s) in
# Note we are only testing for the existence of the file(s) in
# the contents of the directory regardless of any security or
# access rights. If we have made it this far, we have sufficient
# permissions to do that much using Python's equivalent of the