Commit4ff3d45

authored

Merge pull request#26585 from meeseeksmachine/auto-backport-of-pr-26576-on-v3.8.x

Backport PR#26576 on branch v3.8.x (Use sys.platform over os.name)

2 parentsb9ea667 +0b81f6c commit4ff3d45Copy full SHA for 4ff3d45

File tree

-7

lines changed

-7

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1086,7 +1086,7 @@ def find_tex_file(filename):`
`1086`	`1086`	`iflk:`
`1087`	`1087`	`path=lk.search(filename)`
`1088`	`1088`	`else:`
`1089`		`-ifos.name=='nt':`
	`1089`	`+ifsys.platform=='win32':`
`1090`	`1090`	`# On Windows only, kpathsea can use utf-8 for cmd args and output.`
`1091`	`1091`	# The `command_line_encoding` environment variable is set to force
`1092`	`1092`	`# it to always use utf-8 encoding. See Matplotlib issue #11848.`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`frompathlibimportPath`
`3`	`3`	`importplatform`
`4`	`4`	`importre`
	`5`	`+importshutil`
`5`	`6`	`importsubprocess`
`6`	`7`	`importsys`
`7`	`8`	`importweakref`
`@@ -318,7 +319,7 @@ def test_cleanup_temporaries(method_name, tmpdir, anim):`
`318`	`319`	`assertlist(Path(str(tmpdir)).iterdir())== []`
`319`	`320`
`320`	`321`
`321`		`-@pytest.mark.skipif(os.name!="posix",reason="requires a POSIX OS")`
	`322`	`+@pytest.mark.skipif(shutil.which("/bin/sh")isNone,reason="requires a POSIX OS")`
`322`	`323`	`deftest_failing_ffmpeg(tmpdir,monkeypatch,anim):`
`323`	`324`	`"""`
`324`	`325`	`Test that we correctly raise a CalledProcessError when ffmpeg fails.`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ def test_webagg_fallback(backend):`
`11`	`11`	`ifbackend=="nbagg":`
`12`	`12`	`pytest.importorskip("IPython")`
`13`	`13`	`env=dict(os.environ)`
`14`		`-ifos.name!="nt":`
	`14`	`+ifsys.platform!="win32":`
`15`	`15`	`env["DISPLAY"]=""`
`16`	`16`
`17`	`17`	`env["MPLBACKEND"]=backend`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ def test_cross_Qt_imports():`
`473`	`473`
`474`	`474`	`@pytest.mark.skipif('TF_BUILD'inos.environ,`
`475`	`475`	`reason="this test fails an azure for unknown reasons")`
`476`		`-@pytest.mark.skipif(os.name=="nt",reason="Cannot send SIGINT on Windows.")`
	`476`	`+@pytest.mark.skipif(sys.platform=="win32",reason="Cannot send SIGINT on Windows.")`
`477`	`477`	`deftest_webagg():`
`478`	`478`	`pytest.importorskip("tornado")`
`479`	`479`	`proc=subprocess.Popen(`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,9 @@ def test_parse_to_version_info(version_str, version_tuple):`
`17`	`17`	`assertmatplotlib._parse_to_version_info(version_str)==version_tuple`
`18`	`18`
`19`	`19`
`20`		`-@pytest.mark.skipif(`
`21`		`-os.name=="nt",reason="chmod() doesn't work as is on Windows")`
`22`		`-@pytest.mark.skipif(os.name!="nt"andos.geteuid()==0,`
	`20`	`+@pytest.mark.skipif(sys.platform=="win32",`
	`21`	`+reason="chmod() doesn't work as is on Windows")`
	`22`	`+@pytest.mark.skipif(sys.platform!="win32"andos.geteuid()==0,`
`23`	`23`	`reason="chmod() doesn't work as root")`
`24`	`24`	`deftest_tmpconfigdir_warning(tmpdir):`
`25`	`25`	`"""Test that a warning is emitted if a temporary configdir must be used."""`

Comments

(0)