Merge pull request #495 from cjmayo/mswindows

MS Windows Python 3.7 and MS Store compatibility
This commit is contained in:
Chris Mayo 2020-09-01 19:46:44 +01:00 committed by GitHub
commit b1faef93c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 9 deletions

View file

@ -1,4 +1,4 @@
@echo off
:: example using linkchecker on windows, logging to html
set PYDIR=c:\python26
%PYDIR%\python.exe %PYDIR%\scripts\linkchecker -Fhtml http://www.example.com
:: Do replace the for loop with setting SCRIPTSDIR to the literal path
for /f "delims=" %%i in ('python -c "import site; print(site.getusersitepackages().replace('site-packages', 'Scripts'))"') do set SCRIPTSDIR=%%i
python %SCRIPTSDIR%\linkchecker %*

View file

@ -54,7 +54,7 @@ def prepare_urlpath_for_nt(path):
def get_nt_filename(path):
"""Return case sensitive filename for NT path."""
unc, rest = os.path.splitunc(path)
unc, rest = os.path.splitdrive(path)
head, tail = os.path.split(rest)
if not tail:
return path

View file

@ -16,7 +16,8 @@
"""
Test proxy handling.
"""
from test.support import EnvironmentVarGuard
from unittest.mock import patch
from . import httpserver
@ -25,10 +26,11 @@ class TestProxy(httpserver.HttpServerTest):
"""Test no_proxy env var handling."""
def test_noproxy(self):
# set env vars
with EnvironmentVarGuard() as env:
env.set("http_proxy", "http://example.org:8877")
env.set("no_proxy", "localhost:%d" % self.port)
with patch.dict("os.environ",
{
"http_proxy": "http://example.org:8877",
"no_proxy": "localhost:%d" % self.port,
}):
self.noproxy_test()
def noproxy_test(self):