Skip to content

Commit e53d19a

Browse files
committed
Merge remote-tracking branch 'upstream/main' into binary_subscr
2 parents 38830f0 + 8e57877 commit e53d19a

File tree

10 files changed

+171
-13
lines changed

10 files changed

+171
-13
lines changed

Doc/library/errno.rst

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -672,6 +672,171 @@ defined by the module. The specific list of defined symbols is available as
672672

673673
.. versionadded:: 3.11
674674

675+
676+
.. data:: ENOMEDIUM
677+
678+
No medium found
679+
680+
681+
.. data:: EMEDIUMTYPE
682+
683+
Wrong medium type
684+
685+
686+
.. data:: ENOKEY
687+
688+
Required key not available
689+
690+
691+
.. data:: EKEYEXPIRED
692+
693+
Key has expired
694+
695+
696+
.. data:: EKEYREVOKED
697+
698+
Key has been revoked
699+
700+
701+
.. data:: EKEYREJECTED
702+
703+
Key was rejected by service
704+
705+
706+
.. data:: ERFKILL
707+
708+
Operation not possible due to RF-kill
709+
710+
711+
.. data:: ELOCKUNMAPPED
712+
713+
Locked lock was unmapped
714+
715+
716+
.. data:: ENOTACTIVE
717+
718+
Facility is not active
719+
720+
721+
.. data:: EAUTH
722+
723+
Authentication error
724+
725+
.. versionadded:: 3.2
726+
727+
728+
.. data:: EBADARCH
729+
730+
Bad CPU type in executable
731+
732+
.. versionadded:: 3.2
733+
734+
735+
.. data:: EBADEXEC
736+
737+
Bad executable (or shared library)
738+
739+
.. versionadded:: 3.2
740+
741+
742+
.. data:: EBADMACHO
743+
744+
Malformed Mach-o file
745+
746+
.. versionadded:: 3.2
747+
748+
749+
.. data:: EDEVERR
750+
751+
Device error
752+
753+
.. versionadded:: 3.2
754+
755+
756+
.. data:: EFTYPE
757+
758+
Inappropriate file type or format
759+
760+
.. versionadded:: 3.2
761+
762+
763+
.. data:: ENEEDAUTH
764+
765+
Need authenticator
766+
767+
.. versionadded:: 3.2
768+
769+
770+
.. data:: ENOATTR
771+
772+
Attribute not found
773+
774+
.. versionadded:: 3.2
775+
776+
777+
.. data:: ENOPOLICY
778+
779+
Policy not found
780+
781+
.. versionadded:: 3.2
782+
783+
784+
.. data:: EPROCLIM
785+
786+
Too many processes
787+
788+
.. versionadded:: 3.2
789+
790+
791+
.. data:: EPROCUNAVAIL
792+
793+
Bad procedure for program
794+
795+
.. versionadded:: 3.2
796+
797+
798+
.. data:: EPROGMISMATCH
799+
800+
Program version wrong
801+
802+
.. versionadded:: 3.2
803+
804+
805+
.. data:: EPROGUNAVAIL
806+
807+
RPC prog. not avail
808+
809+
.. versionadded:: 3.2
810+
811+
812+
.. data:: EPWROFF
813+
814+
Device power is off
815+
816+
.. versionadded:: 3.2
817+
818+
819+
.. data:: EBADRPC
820+
821+
RPC struct is bad
822+
823+
.. versionadded:: 3.2
824+
825+
826+
.. data:: ERPCMISMATCH
827+
828+
RPC version wrong
829+
830+
.. versionadded:: 3.2
831+
832+
833+
.. data:: ESHLIBVERS
834+
835+
Shared library version mismatch
836+
837+
.. versionadded:: 3.2
838+
839+
675840
.. data:: ENOTCAPABLE
676841

677842
Capabilities insufficient. This error is mapped to the exception

Lib/test/test_genericpath.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ def test_exists(self):
161161
self.assertIs(self.pathmodule.lexists(path=filename), True)
162162

163163
@unittest.skipUnless(hasattr(os, "pipe"), "requires os.pipe()")
164-
@unittest.skipIf(is_emscripten, "Emscripten pipe fds have no stat")
164+
@unittest.skipIf(is_emscripten, "Fixed in next Emscripten release after 4.0.1")
165165
def test_exists_fd(self):
166166
r, w = os.pipe()
167167
try:

Lib/test/test_io.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3928,7 +3928,7 @@ def test_issue35928(self):
39283928
self.assertEqual(res + f.readline(), 'foo\nbar\n')
39293929

39303930
@unittest.skipUnless(hasattr(os, "pipe"), "requires os.pipe()")
3931-
@unittest.skipIf(support.is_emscripten, "Would be fixed by emscripten-core/emscripten#23306")
3931+
@unittest.skipIf(support.is_emscripten, "Fixed in next Emscripten release after 4.0.1")
39323932
def test_read_non_blocking(self):
39333933
import os
39343934
r, w = os.pipe()

Lib/test/test_ntpath.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ def check_error(paths, expected):
940940
self.assertRaises(TypeError, ntpath.commonpath, ['C:\\Foo', b'Foo\\Baz'])
941941
self.assertRaises(TypeError, ntpath.commonpath, ['Foo', b'C:\\Foo\\Baz'])
942942

943-
@unittest.skipIf(is_emscripten, "Emscripten cannot fstat unnamed files.")
943+
@unittest.skipIf(is_emscripten, "Fixed in next Emscripten release after 4.0.1")
944944
def test_sameopenfile(self):
945945
with TemporaryFile() as tf1, TemporaryFile() as tf2:
946946
# Make sure the same file is really the same

Lib/test/test_os.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5093,7 +5093,6 @@ def test_unpickable(self):
50935093
self.assertRaises(TypeError, pickle.dumps, scandir_iter, filename)
50945094
scandir_iter.close()
50955095

5096-
@unittest.skipIf(support.is_emscripten, "Fixed by emscripten-core/emscripten#23139, remove when next Emscripten release comes out")
50975096
def check_entry(self, entry, name, is_dir, is_file, is_symlink):
50985097
self.assertIsInstance(entry, os.DirEntry)
50995098
self.assertEqual(entry.name, name)

Lib/test/test_shutil.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1587,7 +1587,6 @@ def test_copyfile_same_file(self):
15871587
# the path as a directory, but on AIX the trailing slash has no effect
15881588
# and is considered as a file.
15891589
@unittest.skipIf(AIX, 'Not valid on AIX, see gh-92670')
1590-
@unittest.skipIf(support.is_emscripten, 'Fixed by emscripten-core/emscripten#23218, remove when next Emscripten release comes out')
15911590
def test_copyfile_nonexistent_dir(self):
15921591
# Issue 43219
15931592
src_dir = self.mkdtemp()

Lib/test/test_signal.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,7 @@ def test_invalid_socket(self):
253253
self.assertRaises((ValueError, OSError),
254254
signal.set_wakeup_fd, fd)
255255

256-
# Emscripten does not support fstat on pipes yet.
257-
# https://github.com/emscripten-core/emscripten/issues/16414
258-
@unittest.skipIf(support.is_emscripten, "Emscripten cannot fstat pipes.")
256+
@unittest.skipIf(support.is_emscripten, "Fixed in next Emscripten release after 4.0.1")
259257
@unittest.skipUnless(hasattr(os, "pipe"), "requires os.pipe()")
260258
def test_set_wakeup_fd_result(self):
261259
r1, w1 = os.pipe()
@@ -274,7 +272,7 @@ def test_set_wakeup_fd_result(self):
274272
self.assertEqual(signal.set_wakeup_fd(-1), w2)
275273
self.assertEqual(signal.set_wakeup_fd(-1), -1)
276274

277-
@unittest.skipIf(support.is_emscripten, "Emscripten cannot fstat pipes.")
275+
@unittest.skipIf(support.is_emscripten, "Fixed in next Emscripten release after 4.0.1")
278276
@unittest.skipUnless(support.has_socket_support, "needs working sockets.")
279277
def test_set_wakeup_fd_socket_result(self):
280278
sock1 = socket.socket()
@@ -295,7 +293,7 @@ def test_set_wakeup_fd_socket_result(self):
295293
# On Windows, files are always blocking and Windows does not provide a
296294
# function to test if a socket is in non-blocking mode.
297295
@unittest.skipIf(sys.platform == "win32", "tests specific to POSIX")
298-
@unittest.skipIf(support.is_emscripten, "Emscripten cannot fstat pipes.")
296+
@unittest.skipIf(support.is_emscripten, "Fixed in next Emscripten release after 4.0.1")
299297
@unittest.skipUnless(hasattr(os, "pipe"), "requires os.pipe()")
300298
def test_set_wakeup_fd_blocking(self):
301299
rfd, wfd = os.pipe()

Lib/test/test_tarfile.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3800,7 +3800,6 @@ def test_absolute_hardlink(self):
38003800
"'parent' is a link to an absolute path")
38013801

38023802
@symlink_test
3803-
@unittest.skipIf(support.is_emscripten, "Fixed by emscripten-core/emscripten#23136, remove when next Emscripten release comes out")
38043803
def test_sly_relative0(self):
38053804
# Inspired by 'relative0' in jwilk/traversal-archives
38063805
with ArchiveMaker() as arc:

Lib/test/test_zipfile/test_core.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,6 @@ def test_write_to_readonly(self):
624624
with self.assertRaises(ValueError):
625625
zipfp.open(TESTFN, mode='w')
626626

627-
@unittest.skipIf(is_emscripten, "Fixed by emscripten-core/emscripten#23310")
628627
def test_add_file_before_1980(self):
629628
# Set atime and mtime to 1970-01-01
630629
os.utime(TESTFN, (0, 0))

Lib/test/test_zipimport.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,6 @@ def testEmptyFile(self):
10381038
self.assertZipFailure(TESTMOD)
10391039

10401040
@unittest.skipIf(support.is_wasi, "mode 000 not supported.")
1041-
@unittest.skipIf(support.is_emscripten, "Fixed by emscripten-core/emscripten#23137, remove when next Emscripten release comes out")
10421041
def testFileUnreadable(self):
10431042
os_helper.unlink(TESTMOD)
10441043
fd = os.open(TESTMOD, os.O_CREAT, 000)

0 commit comments

Comments
 (0)