summaryrefslogtreecommitdiffstats
path: root/Lib/shutil.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-08-17 12:53:55 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-08-17 12:53:55 (GMT)
commit9a3777e525b389ec5881c3f80a482fb821ab3ea5 (patch)
treee83520348eea751f2b02e8effa76f3cce2c644cd /Lib/shutil.py
parent07351a044960f259c8730de3f81356fbcdbe2bbf (diff)
parent30b9d5d3af043fc2687ad11a188a34fe355e20ef (diff)
downloadcpython-9a3777e525b389ec5881c3f80a482fb821ab3ea5.zip
cpython-9a3777e525b389ec5881c3f80a482fb821ab3ea5.tar.gz
cpython-9a3777e525b389ec5881c3f80a482fb821ab3ea5.tar.bz2
#18705: merge with 3.3.
Diffstat (limited to 'Lib/shutil.py')
-rw-r--r--Lib/shutil.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py
index 6879d8b..502bb67 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -56,7 +56,7 @@ class ReadError(OSError):
"""Raised when an archive cannot be read"""
class RegistryError(Exception):
- """Raised when a registery operation with the archiving
+ """Raised when a registry operation with the archiving
and unpacking registeries fails"""
@@ -193,7 +193,7 @@ def copystat(src, dst, *, follow_symlinks=True):
# * follow_symlinks=False,
# * lchown() is unavailable, and
# * either
- # * fchownat() is unvailable or
+ # * fchownat() is unavailable or
# * fchownat() doesn't implement AT_SYMLINK_NOFOLLOW.
# (it returned ENOSUP.)
# therefore we're out of options--we simply cannot chown the
@@ -983,7 +983,7 @@ elif os.name == 'nt':
def disk_usage(path):
"""Return disk usage statistics about the given path.
- Returned valus is a named tuple with attributes 'total', 'used' and
+ Returned values is a named tuple with attributes 'total', 'used' and
'free', which are the amount of total, used and free space, in bytes.
"""
total, free = nt._getdiskusage(path)