mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-23 17:03:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Issue #26937: Merge 3.6.

Browse source
This commit is contained in:
Xavier de Gaye 2016-12-09 09:35:49 +01:00
commit ec80ba4693
2 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Lib/tarfile.py
View file

@ -50,9 +50,13 @@ import copy
import re import re
try: try:
import grp, pwd import pwd
except ImportError: except ImportError:
grp = pwd = None pwd = None
try:
import grp
except ImportError:
grp = None
# os.symlink on Windows prior to 6.0 raises NotImplementedError # os.symlink on Windows prior to 6.0 raises NotImplementedError
symlink_exception = (AttributeError, NotImplementedError) symlink_exception = (AttributeError, NotImplementedError)
@ -2219,22 +2223,25 @@ class TarFile(object):
def chown(self, tarinfo, targetpath, numeric_owner): def chown(self, tarinfo, targetpath, numeric_owner):
"""Set owner of targetpath according to tarinfo. If numeric_owner """Set owner of targetpath according to tarinfo. If numeric_owner
is True, use .gid/.uid instead of .gname/.uname. is True, use .gid/.uid instead of .gname/.uname. If numeric_owner
is False, fall back to .gid/.uid when the search based on name
fails.
""" """
if pwd and hasattr(os, "geteuid") and os.geteuid() == 0: if hasattr(os, "geteuid") and os.geteuid() == 0:
# We have to be root to do so. # We have to be root to do so.
if numeric_owner:
g = tarinfo.gid g = tarinfo.gid
u = tarinfo.uid u = tarinfo.uid
else: if not numeric_owner:
try: try:
if grp:
g = grp.getgrnam(tarinfo.gname)[2] g = grp.getgrnam(tarinfo.gname)[2]
except KeyError: except KeyError:
g = tarinfo.gid pass
try: try:
if pwd:
u = pwd.getpwnam(tarinfo.uname)[2] u = pwd.getpwnam(tarinfo.uname)[2]
except KeyError: except KeyError:
u = tarinfo.uid pass
try: try:
if tarinfo.issym() and hasattr(os, "lchown"): if tarinfo.issym() and hasattr(os, "lchown"):
os.lchown(targetpath, u, g) os.lchown(targetpath, u, g)

4
Misc/NEWS
View file

@ -168,6 +168,10 @@ Core and Builtins
Library Library
------- -------
- Issue #26937: The chown() method of the tarfile.TarFile class does not fail
now when the grp module cannot be imported, as for example on Android
platforms.
- Issue #28847: dbm.dumb now supports reading read-only files and no longer - Issue #28847: dbm.dumb now supports reading read-only files and no longer
writes the index file when it is not changed. A deprecation warning is now writes the index file when it is not changed. A deprecation warning is now
emitted if the index file is missed and recreated in the 'r' and 'w' modes emitted if the index file is missed and recreated in the 'r' and 'w' modes