Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix test failing on python 3.10

Browse Source
This commit is contained in:
Kovid Goyal 2021-12-13 20:11:30 +05:30
parent a445a73e66
commit 821f71cc4c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/srv/tests/auth.py
View File

@ -5,12 +5,8 @@
__license__ = 'GPL v3' __license__ = 'GPL v3'
__copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>' __copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
import subprocess, os, time import subprocess, os, time, shutil
from collections import namedtuple from collections import namedtuple
try:
from distutils.spawn import find_executable
except ImportError: # windows
find_executable = lambda x: None
from calibre.ptempfile import TemporaryDirectory from calibre.ptempfile import TemporaryDirectory
from calibre.srv.errors import HTTPForbidden from calibre.srv.errors import HTTPForbidden
@ -234,7 +230,7 @@ class TestAuth(BaseTest):
self.ae(urlopen(server).read(), b'closed') self.ae(urlopen(server).read(), b'closed')
# Check using curl # Check using curl
curl = find_executable('curl') curl = shutil.which('curl')
if curl: if curl:
def docurl(data, *args): def docurl(data, *args):
cmd = [curl] + list(args) + ['http://localhost:%d/closed' % server.address[1]] cmd = [curl] + list(args) + ['http://localhost:%d/closed' % server.address[1]]