Skip to content

bpo-34353: Added sockets to stat.filemode fallback python implementation #8703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benjaminp merged 4 commits into from
Aug 10, 2018
Merged

bpo-34353: Added sockets to stat.filemode fallback python implementation #8703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c4b92d1
Added S_IFSOCK to _filemode_table in stat.py
Aug 7, 2018
cb9b170
Added test for socket stat filemode
Aug 8, 2018
939596c
Added NEWS item for socket in stat.filemode
Aug 9, 2018
c613e10
Changed socket cleanup to use context manager syntax instead of try/f…
Aug 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Lib/stat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ def S_ISSOCK(mode):

_filemode_table = (
((S_IFLNK, "l"),
(S_IFSOCK, "s"), # Must appear before IFREG and IFDIR as IFSOCK == IFREG | IFDIR
(S_IFREG, "-"),
(S_IFBLK, "b"),
(S_IFDIR, "d"),
Expand Down
9 changes: 9 additions & 0 deletions Lib/test/test_stat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import unittest
import os
import socket
import sys
from test.support import TESTFN, import_fresh_module

Expand Down Expand Up @@ -191,6 +192,14 @@ def test_devices(self):
self.assertS_IS("BLK", st_mode)
break

@unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'requires unix socket')
def test_socket(self):
with socket.socket(socket.AF_UNIX) as s:
s.bind(TESTFN)
st_mode, modestr = self.get_mode()
self.assertEqual(modestr[0], 's')
self.assertS_IS("SOCK", st_mode)

def test_module_attributes(self):
for key, value in self.stat_struct.items():
modvalue = getattr(self.statmod, key)
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2018-08-09-18-42-49.bpo-34353.GIOm_8.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Added the "socket" option in the `stat.filemode()` Python implementation to
match the C implementation.