Author: Jean-Paul Calderone <exar...@twistedmatrix.com>
Branch: py3.5
Changeset: r92052:1c67ea9ef466
Date: 2017-08-03 14:46 -0400
http://bitbucket.org/pypy/pypy/changeset/1c67ea9ef466/
Log: Mark files of unknown type with `?`
This mirrors CPython _stat.filemode behavior though it diverges from
the (likely rarely used) stat.filemode behavior.
diff --git a/lib-python/3/stat.py b/lib-python/3/stat.py
--- a/lib-python/3/stat.py
+++ b/lib-python/3/stat.py
@@ -139,13 +139,21 @@
def filemode(mode):
"""Convert a file's mode to a string of the form '-rwxrwxrwx'."""
perm = []
+
+ # The first group gets a question mark if none of the bits match the mode.
+ empty = "?"
+
for table in _filemode_table:
for bit, char in table:
if mode & bit == bit:
perm.append(char)
break
else:
- perm.append("-")
+ perm.append(empty)
+
+ # All the rest of the positions get a - if the bits don't match.
+ empty = "-"
+
return "".join(perm)
diff --git a/lib-python/3/test/test_stat.py b/lib-python/3/test/test_stat.py
--- a/lib-python/3/test/test_stat.py
+++ b/lib-python/3/test/test_stat.py
@@ -138,6 +138,10 @@
self.assertS_IS("REG", st_mode)
self.assertEqual(modestr, '-r--r--r--')
self.assertEqual(self.statmod.S_IMODE(st_mode), 0o444)
+
+ # If there are only permission bits, no type bytes, a question
+ # mark is rendered in the type field.
+ self.assertEqual(self.statmod.filemode(0o420), '?r---w----')
else:
os.chmod(TESTFN, 0o700)
st_mode, modestr = self.get_mode()
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
