[3.6] Enable windows CI (#4176). (#4183)

(cherry picked from commit bbaf125)

Co-authored-by: Andrew Svetlov <[email protected]>

.azure-pipelines/stage-test.yml

@@ -37,18 +37,18 @@ stages:
 #          python.version: 'pypy3'
 #          no_extensions: 'Y'
 #          image: 'ubuntu-latest'
-        # Py35-Cython-Win:
-        #   python.version: '3.5'
-        #   no_extensions: ''
-        #   image: 'windows-latest'
-        # Py36-Cython-Win:
-        #   python.version: '3.6'
-        #   no_extensions: ''
-        #   image: 'windows-latest'
-        # Py37-Cython-Win:
-        #   python.version: '3.7'
-        #   no_extensions: ''
-        #   image: 'windows-latest'
+        Py35-Cython-Win:
+          python.version: '3.5'
+          no_extensions: ''
+          image: 'windows-latest'
+        Py36-Cython-Win:
+          python.version: '3.6'
+          no_extensions: ''
+          image: 'windows-latest'
+        Py37-Cython-Win:
+          python.version: '3.7'
+          no_extensions: ''
+          image: 'windows-latest'
         Py35-Cython-Mac:
           python.version: '3.5'
           no_extensions: ''

.gitattributes

@@ -1,3 +1,3 @@
 tests/sample.* binary
-tests/data.unknown_mime_type
-tests/hello.txt.gz
+tests/data.unknown_mime_type binary
+tests/hello.txt.gz binary

aiohttp/web_urldispatcher.py

@@ -553,7 +553,7 @@ def url_for(self, *, filename: Union[str, Path],  # type: ignore
             if filepath.is_file():
                 # TODO cache file content
                 # with file watcher for cache invalidation
-                with open(str(filepath), mode='rb') as f:
+                with filepath.open('rb') as f:
                     file_bytes = f.read()
                 h = self._get_file_hash(file_bytes)
                 url = url.with_query({self.VERSION_KEY: h})

tests/test_client_functional.py

@@ -1251,7 +1251,7 @@ async def handler(request):
     app.router.add_post('/', handler)
     client = await aiohttp_client(app)
 
-    with fname.open() as f:
+    with fname.open('rb') as f:
         resp = await client.post(
             '/', data={'some': f, 'test': b'data'}, chunked=True)
         assert 200 == resp.status
@@ -1273,7 +1273,7 @@ async def handler(request):
     app.router.add_post('/', handler)
     client = await aiohttp_client(app)
 
-    with fname.open() as f:
+    with fname.open('rb') as f:
         resp = await client.post(
             '/',
             data={'some': f},
@@ -1324,8 +1324,8 @@ async def test_POST_FILES_STR(aiohttp_client, fname) -> None:
 
     async def handler(request):
         data = await request.post()
-        with fname.open() as f:
-            content1 = f.read()
+        with fname.open('rb') as f:
+            content1 = f.read().decode()
         content2 = data['some']
         assert content1 == content2
         return web.Response()
@@ -1334,8 +1334,8 @@ async def handler(request):
     app.router.add_post('/', handler)
     client = await aiohttp_client(app)
 
-    with fname.open() as f:
-        resp = await client.post('/', data={'some': f.read()})
+    with fname.open('rb') as f:
+        resp = await client.post('/', data={'some': f.read().decode()})
         assert 200 == resp.status
         resp.close()
 
@@ -1353,7 +1353,7 @@ async def handler(request):
     app.router.add_post('/', handler)
     client = await aiohttp_client(app)
 
-    with fname.open() as f:
+    with fname.open('rb') as f:
         resp = await client.post('/', data=f.read())
         assert 200 == resp.status
         resp.close()
@@ -1373,7 +1373,7 @@ async def handler(request):
     app.router.add_post('/', handler)
     client = await aiohttp_client(app)
 
-    with fname.open() as f:
+    with fname.open('rb') as f:
         resp = await client.post('/', data=[('some', f)])
         assert 200 == resp.status
         resp.close()
@@ -1394,7 +1394,7 @@ async def handler(request):
     app.router.add_post('/', handler)
     client = await aiohttp_client(app)
 
-    with fname.open() as f:
+    with fname.open('rb') as f:
         form = aiohttp.FormData()
         form.add_field('some', f, content_type='text/plain')
         resp = await client.post('/', data=form)
@@ -1406,14 +1406,14 @@ async def test_POST_FILES_SINGLE(aiohttp_client, fname) -> None:
 
     async def handler(request):
         data = await request.text()
-        with fname.open('r') as f:
-            content = f.read()
+        with fname.open('rb') as f:
+            content = f.read().decode()
             assert content == data
-            # if system cannot determine 'application/pgp-keys' MIME type
-            # then use 'application/octet-stream' default
-        assert request.content_type in ['application/pgp-keys',
-                                        'text/plain',
-                                        'application/octet-stream']
+        # if system cannot determine 'text/x-python' MIME type
+        # then use 'application/octet-stream' default
+        assert request.content_type in ['text/plain',
+                                        'application/octet-stream',
+                                        'text/x-python']
         assert 'content-disposition' not in request.headers
 
         return web.Response()
@@ -1422,7 +1422,7 @@ async def handler(request):
     app.router.add_post('/', handler)
     client = await aiohttp_client(app)
 
-    with fname.open() as f:
+    with fname.open('rb') as f:
         resp = await client.post('/', data=f)
         assert 200 == resp.status
         resp.close()
@@ -1433,14 +1433,14 @@ async def test_POST_FILES_SINGLE_content_disposition(
 
     async def handler(request):
         data = await request.text()
-        with fname.open('r') as f:
-            content = f.read()
+        with fname.open('rb') as f:
+            content = f.read().decode()
             assert content == data
-            # if system cannot determine 'application/pgp-keys' MIME type
-            # then use 'application/octet-stream' default
-        assert request.content_type in ['application/pgp-keys',
-                                        'text/plain',
-                                        'application/octet-stream']
+        # if system cannot determine 'application/pgp-keys' MIME type
+        # then use 'application/octet-stream' default
+        assert request.content_type in ['text/plain',
+                                        'application/octet-stream',
+                                        'text/x-python']
         assert request.headers['content-disposition'] == (
             "inline; filename=\"conftest.py\"; filename*=utf-8''conftest.py")
 
@@ -1450,7 +1450,7 @@ async def handler(request):
     app.router.add_post('/', handler)
     client = await aiohttp_client(app)
 
-    with fname.open() as f:
+    with fname.open('rb') as f:
         resp = await client.post(
             '/', data=aiohttp.get_payload(f, disposition='inline'))
         assert 200 == resp.status
@@ -1532,8 +1532,8 @@ async def test_POST_FILES_WITH_DATA(aiohttp_client, fname) -> None:
     async def handler(request):
         data = await request.post()
         assert data['test'] == 'true'
-        assert data['some'].content_type in ['application/pgp-keys',
-                                             'text/plain; charset=utf-8',
+        assert data['some'].content_type in ['text/x-python',
+                                             'text/plain',
                                              'application/octet-stream']
         assert data['some'].filename == fname.name
         with fname.open('rb') as f:
@@ -1545,7 +1545,7 @@ async def handler(request):
     app.router.add_post('/', handler)
     client = await aiohttp_client(app)
 
-    with fname.open() as f:
+    with fname.open('rb') as f:
         resp = await client.post('/', data={'test': 'true', 'some': f})
         assert 200 == resp.status
         resp.close()

tests/test_web_functional.py

@@ -312,8 +312,8 @@ async def test_post_single_file(aiohttp_client) -> None:
 
     def check_file(fs):
         fullname = here / fs.filename
-        with fullname.open() as f:
-            test_data = f.read().encode()
+        with fullname.open('rb') as f:
+            test_data = f.read()
             data = fs.file.read()
             assert test_data == data
 
@@ -332,7 +332,7 @@ async def handler(request):
 
     fname = here / 'data.unknown_mime_type'
 
-    resp = await client.post('/', data=[fname.open()])
+    resp = await client.post('/', data=[fname.open('rb')])
     assert 200 == resp.status
 
 
@@ -375,8 +375,8 @@ async def test_post_files(aiohttp_client) -> None:
 
     def check_file(fs):
         fullname = here / fs.filename
-        with fullname.open() as f:
-            test_data = f.read().encode()
+        with fullname.open('rb') as f:
+            test_data = f.read()
             data = fs.file.read()
             assert test_data == data
 
@@ -393,8 +393,8 @@ async def handler(request):
     app.router.add_post('/', handler)
     client = await aiohttp_client(app)
 
-    with (here / 'data.unknown_mime_type').open() as f1:
-        with (here / 'conftest.py').open() as f2:
+    with (here / 'data.unknown_mime_type').open('rb') as f1:
+        with (here / 'conftest.py').open('rb') as f2:
             resp = await client.post('/', data=[f1, f2])
             assert 200 == resp.status
 

tests/test_web_sendfile_functional.py

@@ -323,9 +323,9 @@ async def test_static_file_huge(aiohttp_client, tmpdir) -> None:
     filename = 'huge_data.unknown_mime_type'
 
     # fill 20MB file
-    with tmpdir.join(filename).open('w') as f:
+    with tmpdir.join(filename).open('wb') as f:
         for i in range(1024*20):
-            f.write(chr(i % 64 + 0x20) * 1024)
+            f.write((chr(i % 64 + 0x20) * 1024).encode())
 
     file_st = os.stat(str(tmpdir.join(filename)))
 
@@ -755,9 +755,9 @@ async def test_static_file_huge_cancel(aiohttp_client, tmpdir) -> None:
     filename = 'huge_data.unknown_mime_type'
 
     # fill 100MB file
-    with tmpdir.join(filename).open('w') as f:
+    with tmpdir.join(filename).open('wb') as f:
         for i in range(1024*20):
-            f.write(chr(i % 64 + 0x20) * 1024)
+            f.write((chr(i % 64 + 0x20) * 1024).encode())
 
     task = None