Codebase list python-procrunner / 2aa45dc
Drop win32api dependency Markus Gerstel 3 years ago
4 changed file(s) with 14 addition(s) and 50 deletion(s). Raw diff Collapse all Expand all
+0
-3
appveyor.yml less more
2929 # Upgrade to the latest pip.
3030 - '%PYTHON%\\python.exe -m pip install -U pip setuptools wheel'
3131 - '%PYTHON%\\python.exe -m pip install -r requirements_dev.txt'
32 # Install win32api dependency. Must use the --only-binary switch explicitly
33 # on AppVeyor
34 - "%PYTHON%\\python.exe -m pip install --only-binary pywin32 pywin32"
3532
3633 build: off
3734
+13
-37
procrunner/__init__.py less more
66 import logging
77 import os
88 import select
9 import shutil
910 import subprocess
1011 import sys
1112 import time
276277 Try and find the full path and file extension of the executable to run.
277278 This is so that e.g. calls to 'somescript' will point at 'somescript.cmd'
278279 without the need to set shell=True in the subprocess.
279 If the executable contains periods it is a special case. Here the
280 win32api call will fail to resolve the extension automatically, and it
281 has do be done explicitly.
282280
283281 :param command: The command array to be run, with the first element being
284282 the command with or w/o path, with or w/o extension.
286284 correct extension. If the executable cannot be resolved for any
287285 reason the original command array is returned.
288286 """
289 try:
290 import win32api
291 except ImportError:
292 if (2, 8) < sys.version_info < (3, 5):
293 logger.info(
294 "Resolving executable names only supported on Python 2.7 and 3.5+"
295 )
296 else:
297 logger.warning(
298 "Could not resolve executable name: package win32api missing"
299 )
300 return command
301
302287 if not command or not isinstance(command[0], str):
303288 return command
304289
305 try:
306 _, found_executable = win32api.FindExecutable(command[0])
290 found_executable = shutil.which(command[0])
291 if found_executable:
307292 logger.debug("Resolved %s as %s", command[0], found_executable)
308 return (found_executable,) + tuple(command[1:])
309 except Exception as e:
310 if not hasattr(e, "winerror"):
311 raise
312 # Keep this error message for later in case we fail to resolve the name
313 logwarning = getattr(e, "strerror", str(e))
314
315 if "." in command[0]:
316 # Special case. The win32api may not properly check file extensions, so
317 # try to resolve the executable explicitly.
293 return (found_executable, *command[1:])
294
295 if "\\" in command[0]:
296 # Special case. shutil.which may not detect file extensions if a full
297 # path is given, so try to resolve the executable explicitly
318298 for extension in os.getenv("PATHEXT").split(os.pathsep):
319 try:
320 _, found_executable = win32api.FindExecutable(command[0] + extension)
321 logger.debug("Resolved %s as %s", command[0], found_executable)
322 return (found_executable,) + tuple(command[1:])
323 except Exception as e:
324 if not hasattr(e, "winerror"):
325 raise
326
327 logger.warning("Error trying to resolve the executable: %s", logwarning)
299 found_executable = shutil.which(command[0] + extension)
300 if found_executable:
301 return (found_executable, *command[1:])
302
303 logger.warning("Error trying to resolve the executable: %s", command[0])
328304 return command
329305
330306
+1
-3
setup.py less more
99 with open("HISTORY.rst") as history_file:
1010 history = history_file.read()
1111
12 requirements = [
13 'pywin32; sys_platform=="win32"',
14 ]
12 requirements = []
1513
1614 setup_requirements = []
1715 needs_pytest = {"pytest", "test", "ptr"}.intersection(sys.argv)
+0
-7
tests/test_procrunner_resolution.py less more
4545
4646
4747 @pytest.mark.skipif(sys.platform != "win32", reason="windows specific test only")
48 def test_pywin32_import():
49 import win32api
50
51 assert win32api
52
53
54 @pytest.mark.skipif(sys.platform != "win32", reason="windows specific test only")
5548 def test_name_resolution_for_simple_exe():
5649 command = ["cmd.exe", "/c", "echo", "hello"]
5750