diff options
33 files changed, 534 insertions, 480 deletions
diff --git a/.ci/travis/install.sh b/.ci/travis/install.sh index 164d1663..ff6b9378 100755 --- a/.ci/travis/install.sh +++ b/.ci/travis/install.sh @@ -32,6 +32,10 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then pyenv install 3.8.5 pyenv virtualenv 3.8.5 psutil ;; + py39) + pyenv install 3.9.0 + pyenv virtualenv 3.9.0 psutil + ;; esac pyenv rehash pyenv activate psutil @@ -41,4 +45,4 @@ if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]] || [[ $PYVER == 'py27' ]]; then pip install -U ipaddress mock unittest2 fi -pip install -U coverage coveralls flake8 setuptools +pip install -U coverage coveralls flake8 setuptools twine diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index 4f9eeef9..1a8b4868 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -1,4 +1,4 @@ -name: Build wheels +name: Linux, macOS, Windows on: [push, pull_request] @@ -6,35 +6,46 @@ jobs: wheel: name: ${{ matrix.os }} runs-on: ${{ matrix.os }} + timeout-minutes: 30 strategy: - fail-fast: false + fail-fast: false # whether to exit the whole run on first failure matrix: - os: [macos-latest, ubuntu-latest] + os: [ubuntu-latest, macos-latest, windows-latest] + include: + - {name: Linux, python: '3.9', os: ubuntu-latest} env: CIBW_TEST_COMMAND: python -u -Wa {project}/psutil/tests/runner.py CIBW_TEST_COMMAND_MACOS: LC_ALL='en_US.utf8' python -Wa {project}/psutil/tests/runner.py CIBW_TEST_EXTRAS: test - CIBW_SKIP: pp*-macosx_x86_64 + # https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip + CIBW_SKIP: cp35-* pp* steps: - - uses: actions/checkout@v1 - - uses: actions/setup-python@v1 - name: Install Python 3.7 + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 with: - python-version: '3.7' + python-version: 3.9 - - name: Install Visual C++ for Python 2.7 - if: startsWith(matrix.os, 'windows') + - name: (Windows) install Visual C++ for Python 2.7 + if: matrix.os == 'windows-latest' run: | choco install vcpython27 -f -y - - name: Install cibuildwheel - run: pip install cibuildwheel==1.4.1 - - - name: Build wheels - run: cibuildwheel . + - name: Run tests + run: | + pip install cibuildwheel + cibuildwheel . - - name: Upload wheels - uses: actions/upload-artifact@v1 + - name: Create wheels + uses: actions/upload-artifact@v2 with: name: wheels path: wheelhouse + + - name: Print hashes + if: matrix.os == 'ubuntu-latest' + run: | + make generate-manifest + python setup.py sdist + mv dist/psutil*.tar.gz wheelhouse/ + python scripts/internal/print_hashes.py wheelhouse/ + diff --git a/.travis.yml b/.travis.yml index d49f2cf1..d9420682 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,21 +2,18 @@ language: python cache: pip matrix: include: + # Linux + - python: 3.8 + - python: 3.9-dev # macOS - language: generic os: osx - env: PYVER=py27 + env: PYVER=py38 - language: generic os: osx - env: PYVER=py36 - # Linux - - python: 2.7 - - python: 3.5 - - python: 3.6 - - python: 3.7 - - python: 3.8 + env: PYVER=py27 # pypy - # - python: pypy + - python: pypy - python: pypy3 install: - ./.ci/travis/install.sh diff --git a/INSTALL.rst b/INSTALL.rst index c3b9e91c..a4f2bf11 100644 --- a/INSTALL.rst +++ b/INSTALL.rst @@ -1,83 +1,38 @@ -Install pip -=========== - -pip is the easiest way to install psutil. It is shipped by default with Python -2.7.9+ and 3.4+. For other Python versions you can install it manually. -On Linux or via wget:: - - wget https://bootstrap.pypa.io/get-pip.py -O - | python +Linux, Windows, macOS (wheels) +============================== -On macOS or via curl:: - - python < <(curl -s https://bootstrap.pypa.io/get-pip.py) - -On Windows, `download pip <https://pip.pypa.io/en/latest/installing/>`__, open -cmd.exe and install it:: +psutil makes extensive use of C extension modules, meaning a C compiler is +required. +For these 3 platforms though, pre-compiled cPython wheels are provided on each +psutil release, so all you have to do is this:: - C:\Python27\python.exe get-pip.py - -Permission issues (UNIX) -======================== - -The commands below assume you're running as root. -If you aren't or you bump into permission errors you can either install psutil -for your user only:: - - pip3 install --user psutil - -...or prepend ``sudo`` and install it globally, e.g.:: + pip3 install psutil - sudo pip3 install psutil +If wheels are not available and you whish to install from sources, keep reading. -Linux -===== +Linux (install from sources) +============================ Ubuntu / Debian:: sudo apt-get install gcc python3-dev - pip3 install psutil + pip3 install --user psutil --no-binary :all: RedHat / CentOS:: sudo yum install gcc python3-devel - pip3 install psutil - -If you're on Python 2 use ``python-dev`` instead. - -macOS -===== + pip3 install --user psutil --no-binary :all: -Install `Xcode <https://developer.apple.com/downloads/?name=Xcode>`__ then run:: - - pip3 install psutil - -Windows -======= - -Open a cmd.exe shell and run:: - - python3 -m pip install psutil +Windows (install from sources) +============================== -This assumes "python" is in your PATH. If not, specify the full python.exe -path. +In order to compile psutil on Windows you'll need **Visual Studio**. +Here's a couple of guides describing how to do it: `1 <https://blog.ionelmc.ro/2014/12/21/compiling-python-extensions-on-windows/>`__ +and `2 <https://cpython-core-tutorial.readthedocs.io/en/latest/build_cpython_windows.html>`__. And then:: -In order to compile psutil from sources you'll need **Visual Studio** (Mingw32 -is not supported). -This `blog post <https://blog.ionelmc.ro/2014/12/21/compiling-python-extensions-on-windows/>`__ -provides numerous info on how to properly set up VS. The needed VS versions are: + pip3 install --user psutil --no-binary :all: -* Python 2.6, 2.7: `VS-2008 <http://www.microsoft.com/en-us/download/details.aspx?id=44266>`__ -* Python 3.4: `VS-2010 <http://www.visualstudio.com/downloads/download-visual-studio-vs#d-2010-express>`__ -* Python 3.5+: `VS-2015 <http://www.visualstudio.com/en-au/news/vs2015-preview-vs>`__ - -Compiling 64 bit versions of Python 2.6 and 2.7 with VS 2008 requires -`Windows SDK and .NET Framework 3.5 SP1 <https://www.microsoft.com/en-us/download/details.aspx?id=3138>`__. -Once installed run `vcvars64.bat` -(see `here <http://stackoverflow.com/questions/11072521/>`__). -Once VS is setup open a cmd.exe shell, cd into psutil directory and run:: - - python3 setup.py build - python3 setup.py install +Note that MinGW compiler is not supported. FreeBSD ======= @@ -85,7 +40,7 @@ FreeBSD :: pkg install python3 gcc - python -m pip3 install psutil + python3 -m pip3 install psutil OpenBSD ======= @@ -118,15 +73,6 @@ Install:: pkg install gcc python3 -m pip install psutil -Install from sources -==================== - -:: - - git clone https://github.com/giampaolo/psutil.git - cd psutil - python3 setup.py install - Testing installation ==================== @@ -137,4 +83,33 @@ Testing installation Dev Guide ========= -See: `dev guide <https://github.com/giampaolo/psutil/blob/master/docs/DEVGUIDE.rst>`__. +`Link <https://github.com/giampaolo/psutil/blob/master/docs/DEVGUIDE.rst>`__. + +Install pip +=========== + +Pip is shipped by default with Python 2.7.9+ and 3.4+. +If you don't have it you can install with wget:: + + wget https://bootstrap.pypa.io/get-pip.py -O - | python3 + +...ow with curl:: + + python3 < <(curl -s https://bootstrap.pypa.io/get-pip.py) + +On Windows, `download pip <https://pip.pypa.io/en/latest/installing/>`__, open +cmd.exe and install it:: + + C:\Python27\python.exe get-pip.py + +Permission issues (UNIX) +======================== + +If you bump into permission errors you have two options. +Install psutil for your user only:: + + pip3 install --user psutil + +...or prepend ``sudo`` and install it at system level:: + + sudo pip3 install psutil diff --git a/MANIFEST.in b/MANIFEST.in index f5ceeb7c..780bbdc7 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,3 @@ -include .cirrus.yml include .coveragerc include .flake8 include .gitignore @@ -112,26 +111,6 @@ include scripts/disk_usage.py include scripts/fans.py include scripts/free.py include scripts/ifconfig.py -include scripts/internal/README -include scripts/internal/bench_oneshot.py -include scripts/internal/bench_oneshot_2.py -include scripts/internal/check_broken_links.py -include scripts/internal/clinter.py -include scripts/internal/convert_readme.py -include scripts/internal/download_wheels_appveyor.py -include scripts/internal/download_wheels_github.py -include scripts/internal/fix_flake8.py -include scripts/internal/generate_manifest.py -include scripts/internal/git_pre_commit.py -include scripts/internal/print_access_denied.py -include scripts/internal/print_announce.py -include scripts/internal/print_api_speed.py -include scripts/internal/print_downloads.py -include scripts/internal/print_timeline.py -include scripts/internal/print_wheels.py -include scripts/internal/purge_installation.py -include scripts/internal/tidelift.py -include scripts/internal/winmake.py include scripts/iotop.py include scripts/killall.py include scripts/meminfo.py @@ -89,7 +89,7 @@ uninstall: ## Uninstall this package via pip. $(PYTHON) scripts/internal/purge_installation.py install-pip: ## Install pip (no-op if already installed). - $(PYTHON) -c \ + @$(PYTHON) -c \ "import sys, ssl, os, pkgutil, tempfile, atexit; \ sys.exit(0) if pkgutil.find_loader('pip') else None; \ pyexc = 'from urllib.request import urlopen' if sys.version_info[0] == 3 else 'from urllib2 import urlopen'; \ @@ -103,7 +103,7 @@ install-pip: ## Install pip (no-op if already installed). f.write(data); \ f.flush(); \ print('downloaded %s' % f.name); \ - code = os.system('%s %s --user' % (sys.executable, f.name)); \ + code = os.system('%s %s --user --upgrade' % (sys.executable, f.name)); \ f.close(); \ sys.exit(code);" @@ -214,14 +214,10 @@ install-git-hooks: ## Install GIT pre-commit hook. download-wheels-appveyor: ## Download latest wheels hosted on appveyor. $(PYTHON) scripts/internal/download_wheels_appveyor.py --user giampaolo --project psutil + ${MAKE} print-wheels download-wheels-github: ## Download latest wheels hosted on github. $(PYTHON) scripts/internal/download_wheels_github.py --user=giampaolo --project=psutil --tokenfile=~/.github.token - -download-wheels: ## Download wheels from github and appveyor - rm -rf dist - ${MAKE} download-wheels-appveyor - # ${MAKE} download-wheels-github ${MAKE} print-wheels print-wheels: ## Print downloaded wheels @@ -265,9 +261,10 @@ pre-release: ## Check if we're ready to produce a new release. ${MAKE} install ${MAKE} generate-manifest git diff MANIFEST.in > /dev/null # ...otherwise 'git diff-index HEAD' will complain - ${MAKE} download-wheels + ${MAKE} download-wheels-github ${MAKE} sdist $(PYTHON) -m twine check dist/* + ${MAKE} md5-dist $(PYTHON) -c \ "from psutil import __version__ as ver; \ doc = open('docs/index.rst').read(); \ @@ -275,10 +272,9 @@ pre-release: ## Check if we're ready to produce a new release. assert ver in doc, '%r not in docs/index.rst' % ver; \ assert ver in history, '%r not in HISTORY.rst' % ver; \ assert 'XXXX' not in history, 'XXXX in HISTORY.rst';" - $(PYTHON) -c "import subprocess, sys; out = subprocess.check_output('git diff --quiet && git diff --cached --quiet', shell=True).strip(); sys.exit('there are uncommitted changes:\n%s' % out) if out else 0 ;" release: ## Create a release (down/uploads tar.gz, wheels, git tag release). - ${MAKE} pre-release + $(PYTHON) -c "import subprocess, sys; out = subprocess.check_output('git diff --quiet && git diff --cached --quiet', shell=True).strip(); sys.exit('there are uncommitted changes:\n%s' % out) if out else 0 ;" $(PYTHON) -m twine upload dist/* # upload tar.gz and Windows wheels on PyPI ${MAKE} git-tag-release ${MAKE} tidelift-relnotes @@ -310,6 +306,9 @@ print-api-speed: ## Benchmark all API calls print-downloads: ## Print PYPI download statistics $(PYTHON) scripts/internal/print_downloads.py +print-hashes: ## Prints hashes of files in dist/ directory + $(PYTHON) scripts/internal/print_hashes.py dist/ + # =================================================================== # Misc # =================================================================== diff --git a/docs/DEVGUIDE.rst b/docs/DEVGUIDE.rst index 2e8272f0..573afdd5 100644 --- a/docs/DEVGUIDE.rst +++ b/docs/DEVGUIDE.rst @@ -1,98 +1,91 @@ +Setup +===== + +psutil makes extensive use of C extension modules, meaning a C compiler is +required, see +`install instructions <https://github.com/giampaolo/psutil/blob/master/INSTALL.rst>`__. + Build, setup and running tests =============================== -Make sure to `install <https://github.com/giampaolo/psutil/blob/master/INSTALL.rst>`__ -a C compiler first, then: +Once you have a compiler installed: .. code-block:: bash - git clone git@github.com:giampaolo/psutil.git - make setup-dev-env - make test + git clone git@github.com:giampaolo/psutil.git + make setup-dev-env # install useful dev libs (flake8, coverage, ...) + make build + make install + make test -- bear in mind that ``make``(see `Makefile`_) is the designated tool to run - tests, build, install etc. and that it is also available on Windows (see +- ``make`` (see `Makefile`_) is the designated tool to run tests, build, install + try new features you're developing, etc. This also includes Windows (see `make.bat`_ ). -- do not use ``sudo``; ``make install`` installs psutil as a limited user in - "edit" mode; also ``make setup-dev-env`` installs deps as a limited user. -- use `make help` to see the list of available commands. - -Coding style -============ - -- python code strictly follows `PEP-8`_ styling guides and this is enforced by - a commit GIT hook installed via ``make install-git-hooks``. -- C code follows `PEP-7`_ styling guides. - -Makefile -======== - -Some useful make commands: + Some useful commands are: .. code-block:: bash - make install - make setup-dev-env # install useful dev libs (flake8, unittest2, etc.) - make test # run unit tests make test-parallel # faster make test-memleaks make test-coverage make lint # Python (PEP8) and C linters + make uninstall + make help -There are some differences between ``make`` on UNIX and Windows. -For instance, to run a specific Python version. On UNIX: +- if you're working on a new feature and you whish to compile & test it "on the + fly" from a test script, this is a quick & dirty way to do it: .. code-block:: bash - make test PYTHON=python3.5 - -On Windows: - -.. code-block:: bat + make test TSCRIPT=test_script.py # on UNIX + make test test_script.py # on Windows - make -p C:\python35\python.exe test +- do not use ``sudo``. ``make install`` installs psutil as a limited user in + "edit" mode, meaning you can edit psutil code on the fly while you develop. -If you want to modify psutil and run a script on the fly which uses it do -(on UNIX): +- if you want to target a specific Python version: .. code-block:: bash - make test TSCRIPT=foo.py + make test PYTHON=python3.5 # UNIX + make test -p C:\python35\python.exe # Windows -On Windows: - -.. code-block:: bat - - make test foo.py +Coding style +============ -Adding a new feature -==================== +- python code strictly follows `PEP-8`_ styling guides and this is enforced by + a commit GIT hook installed via ``make install-git-hooks`` which will reject + commits if code is not PEP-8 complieant. +- C code should follow `PEP-7`_ styling guides. -Usually the files involved when adding a new functionality are: +Code organization +================= .. code-block:: bash - psutil/__init__.py # main psutil namespace - psutil/_ps{platform}.py # python platform wrapper - psutil/_psutil_{platform}.c # C platform extension - psutil/_psutil_{platform}.h # C header file + psutil/__init__.py # main psutil namespace ("import psutil") + psutil/_ps{platform}.py # platform-specific python wrapper + psutil/_psutil_{platform}.c # platform-specific C extension psutil/tests/test_process|system.py # main test suite - psutil/tests/test_{platform}.py # platform specific test suite + psutil/tests/test_{platform}.py # platform-specific test suite + +Adding a new API +================ -Typical process occurring when adding a new functionality (API): +Typically, this is what you do: -- define the new function in `psutil/__init__.py`_. +- define the new API in `psutil/__init__.py`_. - write the platform specific implementation in ``psutil/_ps{platform}.py`` (e.g. `psutil/_pslinux.py`_). -- if the change requires C, write the C implementation in +- if the change requires C code, write the C implementation in ``psutil/_psutil_{platform}.c`` (e.g. `psutil/_psutil_linux.c`_). - write a generic test in `psutil/tests/test_system.py`_ or `psutil/tests/test_process.py`_. -- if possible, write a platform specific test in +- if possible, write a platform-specific test in ``psutil/tests/test_{platform}.py`` (e.g. `psutil/tests/test_linux.py`_). - This usually means testing the return value of the new feature against + This usually means testing the return value of the new API against a system CLI tool. -- update doc in ``doc/index.py``. +- update the doc in ``doc/index.py``. - update ``HISTORY.rst``. - make a pull request. @@ -100,52 +93,44 @@ Make a pull request =================== - fork psutil (go to https://github.com/giampaolo/psutil and click on "fork") -- git clone your fork locally: ``git clone git@github.com:YOUR-USERNAME/psutil.git``) -- create your feature branch:``git checkout -b new-feature`` +- git clone the fork locally: ``git clone git@github.com:YOUR-USERNAME/psutil.git``) +- create a branch:``git checkout -b new-feature`` - commit your changes: ``git commit -am 'add some feature'`` -- push to the branch: ``git push origin new-feature`` -- create a new pull request by via github web interface -- remember to update `HISTORY.rst`_ and `CREDITS`_ files. +- push the branch: ``git push origin new-feature`` +- create a new PR by via GitHub web interface Continuous integration ====================== -All of the services listed below are automatically run on ``git push``. +All of the services listed below are automatically run on each ``git push``. Unit tests ---------- -Tests are automatically run for every GIT push on **Linux**, **macOS** and -**Windows** by using: +Tests are automatically run on every GIT push on **Linux**, **macOS**, +**Windows** and **FreeBSD** by using: - `Travis`_ (Linux, macOS) +- `Github Actions`_ (Linux, macOS, Windows) - `Appveyor`_ (Windows) - -Test files controlling these are `.travis.yml`_ and `appveyor.yml`_. -Both services run psutil test suite against all supported python version -(2.6 - 3.6). -Two icons in the home page (README) always show the build status: +- `Cirrus CI`_ (FreeBSD) .. image:: https://img.shields.io/travis/giampaolo/psutil/master.svg?maxAge=3600&label=Linux,%20OSX,%20PyPy :target: https://travis-ci.org/giampaolo/psutil - :alt: Linux, macOS and PyPy3 tests (Travis) .. image:: https://img.shields.io/appveyor/ci/giampaolo/psutil/master.svg?maxAge=3600&label=Windows :target: https://ci.appveyor.com/project/giampaolo/psutil - :alt: Windows tests (Appveyor) .. image:: https://img.shields.io/cirrus/github/giampaolo/psutil?label=FreeBSD :target: https://cirrus-ci.com/github/giampaolo/psutil-cirrus-ci - :alt: FreeBSD tests (Cirrus-CI) -BSD, AIX and Solaris are currently tested manually. +OpenBSD, NetBSD, AIX and Solaris does not have continuos test integration. Test coverage ------------- Test coverage is provided by `coveralls.io`_ and it is controlled via `.travis.yml`_. -An icon in the home page (README) always shows the last coverage percentage: .. image:: https://coveralls.io/repos/giampaolo/psutil/badge.svg?branch=master&service=github :target: https://coveralls.io/github/giampaolo/psutil?branch=master @@ -155,26 +140,18 @@ Documentation ============= - doc source code is written in a single file: `/docs/index.rst`_. -- it uses `RsT syntax`_ - and it's built with `sphinx`_. - doc can be built with ``make setup-dev-env; cd docs; make html``. -- public doc is hosted on http://psutil.readthedocs.io/ +- public doc is hosted at https://psutil.readthedocs.io -Releasing a new version -======================= -These are notes for myself (Giampaolo): - -- ``make release`` -- post announce (``make print-announce``) on psutil and python-announce mailing - lists, twitter, g+, blog. - - -.. _`.travis.yml`: https://github.com/giampaolo/psutil/blob/master/.travis.ym -.. _`appveyor.yml`: https://github.com/giampaolo/psutil/blob/master/appveyor.ym +.. _`.travis.yml`: https://github.com/giampaolo/psutil/blob/master/.travis.yml +.. _`appveyor.yml`: https://github.com/giampaolo/psutil/blob/master/appveyor.yml .. _`Appveyor`: https://ci.appveyor.com/project/giampaolo/psuti +.. _`Cirrus CI`: https://cirrus-ci.com/github/giampaolo/psutil-cirrus-ci .. _`coveralls.io`: https://coveralls.io/github/giampaolo/psuti +.. _`CREDITS`: https://github.com/giampaolo/psutil/blob/master/CREDITS .. _`doc/index.rst`: https://github.com/giampaolo/psutil/blob/master/doc/index.rst +.. _`Github Actions`: https://github.com/giampaolo/psutil/actions .. _`HISTORY.rst`: https://github.com/giampaolo/psutil/blob/master/HISTORY.rst .. _`make.bat`: https://github.com/giampaolo/psutil/blob/master/make.bat .. _`Makefile`: https://github.com/giampaolo/psutil/blob/master/Makefile @@ -189,5 +166,3 @@ These are notes for myself (Giampaolo): .. _`RsT syntax`: http://docutils.sourceforge.net/docs/user/rst/quickref.htm .. _`sphinx`: http://sphinx-doc.org .. _`Travis`: https://travis-ci.org/giampaolo/psuti -.. _`HISTORY.rst`: https://github.com/giampaolo/psutil/blob/master/HISTORY.rst -.. _`CREDITS`: https://github.com/giampaolo/psutil/blob/master/CREDITS diff --git a/docs/index.rst b/docs/index.rst index 1c71f823..46795150 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -2518,10 +2518,12 @@ FAQs Unfortunately there's not much you can do about this except running the Python process with higher privileges. On Unix you may run the Python process as root or use the SUID bit - (this is the trick used by tools such as ``ps`` and ``netstat``). + (``ps`` and ``netstat`` does this). On Windows you may run the Python process as NT AUTHORITY\\SYSTEM or install - the Python script as a Windows service (this is the trick used by tools - such as ProcessHacker). + the Python script as a Windows service (ProcessHacker does this). + +* Q: is MinGW supported on Windows? +* A: no, you should Visual Studio (see `development guide`_). Running tests ============= diff --git a/psutil/__init__.py b/psutil/__init__.py index 829bb33e..fc7f225a 100644 --- a/psutil/__init__.py +++ b/psutil/__init__.py @@ -190,9 +190,11 @@ __all__ = [ "users", "boot_time", # others ] + __all__.extend(_psplatform.__extra__all__) -if LINUX or FREEBSD: +# Linux, FreeBSD +if hasattr(_psplatform.Process, "rlimit"): # Populate global namespace with RLIM* constants. from . import _psutil_posix diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py index b17b96a2..18439c82 100644 --- a/psutil/_pslinux.py +++ b/psutil/_pslinux.py @@ -75,7 +75,6 @@ __extra__all__ = [ POWER_SUPPLY_PATH = "/sys/class/power_supply" HAS_SMAPS = os.path.exists('/proc/%s/smaps' % os.getpid()) -HAS_PRLIMIT = hasattr(cext, "linux_prlimit") HAS_PROC_IO_PRIORITY = hasattr(cext, "proc_ioprio_get") HAS_CPU_AFFINITY = hasattr(cext, "proc_cpu_affinity_get") _DEFAULT = object() @@ -308,6 +307,54 @@ except Exception: # pragma: no cover # ===================================================================== +# --- prlimit +# ===================================================================== + +# Backport of resource.prlimit() for Python 2. Originally this was done +# in C, but CentOS-6 which we use to create manylinux wheels is too old +# and does not support prlimit() syscall. As such the resulting wheel +# would not include prlimit(), even when installed on newer systems. +# This is the only part of psutil using ctypes. + +prlimit = None +try: + from resource import prlimit # python >= 3.4 +except ImportError: + import ctypes + + libc = ctypes.CDLL(None, use_errno=True) + + if hasattr(libc, "prlimit"): + + def prlimit(pid, resource_, limits=None): + class StructRlimit(ctypes.Structure): + _fields_ = [('rlim_cur', ctypes.c_longlong), + ('rlim_max', ctypes.c_longlong)] + + current = StructRlimit() + if limits is None: + # get + ret = libc.prlimit(pid, resource_, None, ctypes.byref(current)) + else: + # set + new = StructRlimit() + new.rlim_cur = limits[0] + new.rlim_max = limits[1] + ret = libc.prlimit( + pid, resource_, ctypes.byref(new), ctypes.byref(current)) + + if ret != 0: + errno = ctypes.get_errno() + raise OSError(errno, os.strerror(errno)) + return (current.rlim_cur, current.rlim_max) + + +if prlimit is not None: + __extra__all__.extend( + [x for x in dir(cext) if x.startswith('RLIM') and x.isupper()]) + + +# ===================================================================== # --- system memory # ===================================================================== @@ -1990,10 +2037,10 @@ class Process(object): raise ValueError("value not in 0-7 range") return cext.proc_ioprio_set(self.pid, ioclass, value) - if HAS_PRLIMIT: + if prlimit is not None: @wrap_exceptions - def rlimit(self, resource, limits=None): + def rlimit(self, resource_, limits=None): # If pid is 0 prlimit() applies to the calling process and # we don't want that. We should never get here though as # PID 0 is not supported on Linux. @@ -2002,15 +2049,14 @@ class Process(object): try: if limits is None: # get - return cext.linux_prlimit(self.pid, resource) + return prlimit(self.pid, resource_) else: # set if len(limits) != 2: raise ValueError( "second argument must be a (soft, hard) tuple, " "got %s" % repr(limits)) - soft, hard = limits - cext.linux_prlimit(self.pid, resource, soft, hard) + prlimit(self.pid, resource_, limits) except OSError as err: if err.errno == errno.ENOSYS and pid_exists(self.pid): # I saw this happening on Travis: diff --git a/psutil/_psutil_linux.c b/psutil/_psutil_linux.c index 4def9692..5836cd6b 100644 --- a/psutil/_psutil_linux.c +++ b/psutil/_psutil_linux.c @@ -23,6 +23,7 @@ #include <sys/socket.h> #include <linux/sockios.h> #include <linux/if.h> +#include <sys/resource.h> // see: https://github.com/giampaolo/psutil/issues/659 #ifdef PSUTIL_ETHTOOL_MISSING_TYPES @@ -42,17 +43,6 @@ static const int NCPUS_START = sizeof(unsigned long) * CHAR_BIT; // Linux >= 2.6.13 #define PSUTIL_HAVE_IOPRIO defined(__NR_ioprio_get) && defined(__NR_ioprio_set) -// Linux >= 2.6.36 (supposedly) and glibc >= 2.13 -#define PSUTIL_HAVE_PRLIMIT \ - defined(__NR_prlimit64) && \ - (__GLIBC__ >= 2 && __GLIBC_MINOR__ >= 13) - -#if PSUTIL_HAVE_PRLIMIT - #define _FILE_OFFSET_BITS 64 - #include <time.h> - #include <sys/resource.h> -#endif - // Should exist starting from CentOS 6 (year 2011). #ifdef CPU_ALLOC #define PSUTIL_HAVE_CPU_AFFINITY @@ -133,66 +123,6 @@ psutil_proc_ioprio_set(PyObject *self, PyObject *args) { #endif -#if PSUTIL_HAVE_PRLIMIT -/* - * A wrapper around prlimit(2); sets process resource limits. - * This can be used for both get and set, in which case extra - * 'soft' and 'hard' args must be provided. - */ -static PyObject * -psutil_linux_prlimit(PyObject *self, PyObject *args) { - pid_t pid; - int ret, resource; - struct rlimit old, new; - struct rlimit *newp = NULL; - PyObject *py_soft = NULL; - PyObject *py_hard = NULL; - - if (! PyArg_ParseTuple(args, _Py_PARSE_PID "i|OO", &pid, &resource, - &py_soft, &py_hard)) { - return NULL; - } - - // get - if (py_soft == NULL && py_hard == NULL) { - ret = prlimit(pid, resource, NULL, &old); - if (ret == -1) - return PyErr_SetFromErrno(PyExc_OSError); - if (sizeof(old.rlim_cur) > sizeof(long)) { - return Py_BuildValue("LL", - (PY_LONG_LONG)old.rlim_cur, - (PY_LONG_LONG)old.rlim_max); - } - return Py_BuildValue("ll", (long)old.rlim_cur, (long)old.rlim_max); - } - - // set - else { -#if defined(HAVE_LONG_LONG) - new.rlim_cur = PyLong_AsLongLong(py_soft); - if (new.rlim_cur == (rlim_t) - 1 && PyErr_Occurred()) - return NULL; - new.rlim_max = PyLong_AsLongLong(py_hard); - if (new.rlim_max == (rlim_t) - 1 && PyErr_Occurred()) - return NULL; -#else - new.rlim_cur = PyLong_AsLong(py_soft); - if (new.rlim_cur == (rlim_t) - 1 && PyErr_Occurred()) - return NULL; - new.rlim_max = PyLong_AsLong(py_hard); - if (new.rlim_max == (rlim_t) - 1 && PyErr_Occurred()) - return NULL; -#endif - newp = &new; - ret = prlimit(pid, resource, newp, &old); - if (ret == -1) - return PyErr_SetFromErrno(PyExc_OSError); - Py_RETURN_NONE; - } -} -#endif - - /* * Return disk mounted partitions as a list of tuples including device, * mount point and filesystem type @@ -572,10 +502,6 @@ static PyMethodDef mod_methods[] = { {"linux_sysinfo", psutil_linux_sysinfo, METH_VARARGS, "A wrapper around sysinfo(), return system memory usage statistics"}, -#if PSUTIL_HAVE_PRLIMIT - {"linux_prlimit", psutil_linux_prlimit, METH_VARARGS, - "Get or set process resource limits."}, -#endif // --- others {"set_testing", psutil_set_testing, METH_NOARGS, "Set psutil in testing mode"}, diff --git a/psutil/_psutil_posix.c b/psutil/_psutil_posix.c index 876b4129..b41c6dec 100644 --- a/psutil/_psutil_posix.c +++ b/psutil/_psutil_posix.c @@ -28,17 +28,20 @@ #include <netdb.h> #include <linux/types.h> #include <linux/if_packet.h> -#elif defined(PSUTIL_BSD) || defined(PSUTIL_OSX) +#endif +#if defined(PSUTIL_BSD) || defined(PSUTIL_OSX) #include <netdb.h> #include <netinet/in.h> #include <net/if_dl.h> #include <sys/sockio.h> #include <net/if_media.h> #include <net/if.h> -#elif defined(PSUTIL_SUNOS) +#endif +#if defined(PSUTIL_SUNOS) #include <netdb.h> #include <sys/sockio.h> -#elif defined(PSUTIL_AIX) +#endif +#if defined(PSUTIL_AIX) #include <netdb.h> #endif #if defined(PSUTIL_LINUX) || defined(PSUTIL_FREEBSD) diff --git a/psutil/_psutil_windows.c b/psutil/_psutil_windows.c index c8b2f383..b836d708 100644 --- a/psutil/_psutil_windows.c +++ b/psutil/_psutil_windows.c @@ -211,7 +211,7 @@ psutil_proc_wait(PyObject *self, PyObject *args) { Py_RETURN_NONE; } else { - PyErr_SetFromWindowsErr(0); + PyErr_SetFromOSErrnoWithSyscall("OpenProcess"); return NULL; } } diff --git a/psutil/arch/osx/process_info.c b/psutil/arch/osx/process_info.c index 51df3483..1dca7364 100644 --- a/psutil/arch/osx/process_info.c +++ b/psutil/arch/osx/process_info.c @@ -297,12 +297,9 @@ psutil_get_environ(pid_t pid) { while (*arg_ptr != '\0' && arg_ptr < arg_end) { char *s = memchr(arg_ptr + 1, '\0', arg_end - arg_ptr); - if (s == NULL) break; - memcpy(procenv + (arg_ptr - env_start), arg_ptr, s - arg_ptr); - arg_ptr = s + 1; } diff --git a/psutil/arch/windows/wmi.c b/psutil/arch/windows/wmi.c index ec5cdeb5..f9a847d3 100644 --- a/psutil/arch/windows/wmi.c +++ b/psutil/arch/windows/wmi.c @@ -73,7 +73,7 @@ psutil_init_loadavg_counter(PyObject *self, PyObject *args) { event = CreateEventW(NULL, FALSE, FALSE, L"LoadUpdateEvent"); if (event == NULL) { - PyErr_SetFromWindowsErr(GetLastError()); + PyErr_SetFromWindowsErr(0); return NULL; } @@ -91,7 +91,7 @@ psutil_init_loadavg_counter(PyObject *self, PyObject *args) { WT_EXECUTEDEFAULT); if (ret == 0) { - PyErr_SetFromWindowsErr(GetLastError()); + PyErr_SetFromWindowsErr(0); return NULL; } diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py index b508a629..36f83435 100644 --- a/psutil/tests/__init__.py +++ b/psutil/tests/__init__.py @@ -97,7 +97,7 @@ __all__ = [ 'chdir', 'safe_rmpath', 'create_exe', 'decode_path', 'encode_path', 'get_testfn', # os - 'get_winver', 'get_kernel_version', + 'get_winver', 'kernel_version', # sync primitives 'call_until', 'wait_for_pid', 'wait_for_file', # network @@ -122,8 +122,8 @@ PYPY = '__pypy__' in sys.builtin_module_names TRAVIS = 'TRAVIS' in os.environ APPVEYOR = 'APPVEYOR' in os.environ CIRRUS = 'CIRRUS' in os.environ -GITHUB_WHEELS = 'CIBUILDWHEEL' in os.environ -CI_TESTING = TRAVIS or APPVEYOR or CIRRUS or GITHUB_WHEELS +GITHUB_ACTIONS = 'GITHUB_ACTIONS' in os.environ or 'CIBUILDWHEEL' in os.environ +CI_TESTING = TRAVIS or APPVEYOR or CIRRUS or GITHUB_ACTIONS # are we a 64 bit process? IS_64BIT = sys.maxsize > 2 ** 32 @@ -204,7 +204,7 @@ def _get_py_exe(): else: return exe - if GITHUB_WHEELS: + if GITHUB_ACTIONS: if PYPY: return which("pypy3") if PY3 else which("pypy") else: @@ -499,7 +499,7 @@ def terminate(proc_or_pid, sig=signal.SIGTERM, wait_timeout=GLOBAL_TIMEOUT): def sendsig(proc, sig): # XXX: otherwise the build hangs for some reason. - if MACOS and GITHUB_WHEELS: + if MACOS and GITHUB_ACTIONS: sig = signal.SIGKILL # If the process received SIGSTOP, SIGCONT is necessary first, # otherwise SIGTERM won't work. @@ -597,7 +597,7 @@ def reap_children(recursive=False): # =================================================================== -def get_kernel_version(): +def kernel_version(): """Return a tuple such as (2, 6, 36).""" if not POSIX: raise NotImplementedError("not POSIX") @@ -902,7 +902,13 @@ class PsutilTestCase(TestCase): self.assertRaises(psutil.NoSuchProcess, psutil.Process, proc.pid) if isinstance(proc, (psutil.Process, psutil.Popen)): assert not proc.is_running() - self.assertRaises(psutil.NoSuchProcess, proc.status) + try: + status = proc.status() + except psutil.NoSuchProcess: + pass + else: + raise AssertionError("Process.status() didn't raise exception " + "(status=%s)" % status) proc.wait(timeout=0) # assert not raise TimeoutExpired assert not psutil.pid_exists(proc.pid), proc.pid self.assertNotIn(proc.pid, psutil.pids()) @@ -1059,39 +1065,90 @@ def print_sysinfo(): import collections import datetime import getpass + import locale import platform + import pprint + try: + import pip + except ImportError: + pip = None + try: + import wheel + except ImportError: + wheel = None info = collections.OrderedDict() - info['OS'] = platform.system() - if psutil.OSX: - info['version'] = str(platform.mac_ver()) + + # OS + if psutil.LINUX and which('lsb_release'): + info['OS'] = sh('lsb_release -d -s') + elif psutil.OSX: + info['OS'] = 'Darwin %s' % platform.mac_ver()[0] elif psutil.WINDOWS: - info['version'] = ' '.join(map(str, platform.win32_ver())) + info['OS'] = "Windows " + ' '.join( + map(str, platform.win32_ver())) if hasattr(platform, 'win32_edition'): - info['edition'] = platform.win32_edition() + info['OS'] += ", " + platform.win32_edition() else: - info['version'] = platform.version() - if psutil.POSIX: - info['kernel'] = '.'.join(map(str, get_kernel_version())) + info['OS'] = "%s %s" % (platform.system(), platform.version()) info['arch'] = ', '.join( list(platform.architecture()) + [platform.machine()]) - info['hostname'] = platform.node() + if psutil.POSIX: + info['kernel'] = platform.uname()[2] + + # python info['python'] = ', '.join([ platform.python_implementation(), platform.python_version(), platform.python_compiler()]) + info['pip'] = getattr(pip, '__version__', 'not installed') + if wheel is not None: + info['pip'] += " (wheel=%s)" % wheel.__version__ + + # UNIX if psutil.POSIX: + if which('gcc'): + out = sh(['gcc', '--version']) + info['gcc'] = str(out).split('\n')[0] + else: + info['gcc'] = 'not installed' s = platform.libc_ver()[1] if s: info['glibc'] = s + + # system info['fs-encoding'] = sys.getfilesystemencoding() + lang = locale.getlocale() + info['lang'] = '%s, %s' % (lang[0], lang[1]) + info['boot-time'] = datetime.datetime.fromtimestamp( + psutil.boot_time()).strftime("%Y-%m-%d %H:%M:%S") info['time'] = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") info['user'] = getpass.getuser() - info['pid'] = os.getpid() - print("=" * 70) # NOQA + info['home'] = os.path.expanduser("~") + info['cwd'] = os.getcwd() + info['hostname'] = platform.node() + info['PID'] = os.getpid() + + # metrics + pinfo = psutil.Process().as_dict() + pinfo.pop('memory_maps', None) + info['cpus'] = psutil.cpu_count() + info['loadavg'] = "%.1f%%, %.1f%%, %.1f%%" % ( + tuple([x / psutil.cpu_count() * 100 for x in psutil.getloadavg()])) + mem = psutil.virtual_memory() + info['memory'] = "%s%%, %s/%s" % ( + int(mem.percent), bytes2human(mem.used), bytes2human(mem.total)) + swap = psutil.swap_memory() + info['swap'] = "%s%%, %s/%s" % ( + int(swap.percent), bytes2human(swap.used), bytes2human(swap.total)) + info['pids'] = len(psutil.pids()) + info['proc'] = pprint.pformat(pinfo) + + print("=" * 70, file=sys.stderr) # NOQA for k, v in info.items(): - print("%-14s %s" % (k + ':', v)) # NOQA - print("=" * 70) # NOQA + print("%-17s %s" % (k + ':', v), file=sys.stderr) # NOQA + print("=" * 70, file=sys.stderr) # NOQA + sys.stdout.flush() def _get_eligible_cpu(): @@ -1099,7 +1156,7 @@ def _get_eligible_cpu(): if hasattr(p, "cpu_num"): return p.cpu_num() elif hasattr(p, "cpu_affinity"): - return p.cpu_affinity()[0] + return random.choice(p.cpu_affinity()) return 0 @@ -1366,8 +1423,9 @@ def skip_on_not_implemented(only_if=None): # =================================================================== +# XXX: no longer used def get_free_port(host='127.0.0.1'): - """Return an unused TCP port.""" + """Return an unused TCP port. Subject to race conditions.""" with contextlib.closing(socket.socket()) as sock: sock.bind((host, 0)) return sock.getsockname()[1] @@ -1504,6 +1562,83 @@ def check_net_address(addr, family): raise ValueError("unknown family %r", family) +def check_connection_ntuple(conn): + """Check validity of a connection namedtuple.""" + def check_ntuple(conn): + has_pid = len(conn) == 7 + assert len(conn) in (6, 7), len(conn) + assert conn[0] == conn.fd, conn.fd + assert conn[1] == conn.family, conn.family + assert conn[2] == conn.type, conn.type + assert conn[3] == conn.laddr, conn.laddr + assert conn[4] == conn.raddr, conn.raddr + assert conn[5] == conn.status, conn.status + if has_pid: + assert conn[6] == conn.pid, conn.pid + + def check_family(conn): + assert conn.family in (AF_INET, AF_INET6, AF_UNIX), conn.family + if enum is not None: + assert isinstance(conn.family, enum.IntEnum), conn + else: + assert isinstance(conn.family, int), conn + if conn.family == AF_INET: + # actually try to bind the local socket; ignore IPv6 + # sockets as their address might be represented as + # an IPv4-mapped-address (e.g. "::127.0.0.1") + # and that's rejected by bind() + s = socket.socket(conn.family, conn.type) + with contextlib.closing(s): + try: + s.bind((conn.laddr[0], 0)) + except socket.error as err: + if err.errno != errno.EADDRNOTAVAIL: + raise + elif conn.family == AF_UNIX: + assert conn.status == psutil.CONN_NONE, conn.status + + def check_type(conn): + # SOCK_SEQPACKET may happen in case of AF_UNIX socks + SOCK_SEQPACKET = getattr(socket, "SOCK_SEQPACKET", object()) + assert conn.type in (socket.SOCK_STREAM, socket.SOCK_DGRAM, + SOCK_SEQPACKET), conn.type + if enum is not None: + assert isinstance(conn.type, enum.IntEnum), conn + else: + assert isinstance(conn.type, int), conn + if conn.type == socket.SOCK_DGRAM: + assert conn.status == psutil.CONN_NONE, conn.status + + def check_addrs(conn): + # check IP address and port sanity + for addr in (conn.laddr, conn.raddr): + if conn.family in (AF_INET, AF_INET6): + assert isinstance(addr, tuple), type(addr) + if not addr: + continue + assert isinstance(addr.port, int), type(addr.port) + assert 0 <= addr.port <= 65535, addr.port + check_net_address(addr.ip, conn.family) + elif conn.family == AF_UNIX: + assert isinstance(addr, str), type(addr) + + def check_status(conn): + assert isinstance(conn.status, str), conn.status + valids = [getattr(psutil, x) for x in dir(psutil) + if x.startswith('CONN_')] + assert conn.status in valids, conn.status + if conn.family in (AF_INET, AF_INET6) and conn.type == SOCK_STREAM: + assert conn.status != psutil.CONN_NONE, conn.status + else: + assert conn.status == psutil.CONN_NONE, conn.status + + check_ntuple(conn) + check_family(conn) + check_type(conn) + check_addrs(conn) + check_status(conn) + + # =================================================================== # --- compatibility # =================================================================== diff --git a/psutil/tests/test_connections.py b/psutil/tests/test_connections.py index d1425bcb..ba019ec0 100755 --- a/psutil/tests/test_connections.py +++ b/psutil/tests/test_connections.py @@ -6,10 +6,9 @@ """Tests for net_connections() and Process.connections() APIs.""" -import contextlib -import errno import os import socket +import sys import textwrap from contextlib import closing from socket import AF_INET @@ -31,11 +30,9 @@ from psutil._compat import PY3 from psutil.tests import AF_UNIX from psutil.tests import bind_socket from psutil.tests import bind_unix_socket -from psutil.tests import check_net_address +from psutil.tests import check_connection_ntuple from psutil.tests import CIRRUS from psutil.tests import create_sockets -from psutil.tests import enum -from psutil.tests import get_free_port from psutil.tests import HAS_CONNECTIONS_UNIX from psutil.tests import PsutilTestCase from psutil.tests import reap_children @@ -52,10 +49,11 @@ from psutil.tests import wait_for_file thisproc = psutil.Process() SOCK_SEQPACKET = getattr(socket, "SOCK_SEQPACKET", object()) +PYTHON_39 = sys.version_info[:2] == (3, 9) @serialrun -class _ConnTestCase(PsutilTestCase): +class ConnectionTestCase(PsutilTestCase): def setUp(self): if not (NETBSD or FREEBSD): @@ -90,93 +88,19 @@ class _ConnTestCase(PsutilTestCase): proc_cons.sort() self.assertEqual(proc_cons, sys_cons) - def check_connection_ntuple(self, conn): - """Check validity of a connection namedtuple.""" - def check_ntuple(conn): - has_pid = len(conn) == 7 - self.assertIn(len(conn), (6, 7)) - self.assertEqual(conn[0], conn.fd) - self.assertEqual(conn[1], conn.family) - self.assertEqual(conn[2], conn.type) - self.assertEqual(conn[3], conn.laddr) - self.assertEqual(conn[4], conn.raddr) - self.assertEqual(conn[5], conn.status) - if has_pid: - self.assertEqual(conn[6], conn.pid) - - def check_family(conn): - self.assertIn(conn.family, (AF_INET, AF_INET6, AF_UNIX)) - if enum is not None: - assert isinstance(conn.family, enum.IntEnum), conn - else: - assert isinstance(conn.family, int), conn - if conn.family == AF_INET: - # actually try to bind the local socket; ignore IPv6 - # sockets as their address might be represented as - # an IPv4-mapped-address (e.g. "::127.0.0.1") - # and that's rejected by bind() - s = socket.socket(conn.family, conn.type) - with contextlib.closing(s): - try: - s.bind((conn.laddr[0], 0)) - except socket.error as err: - if err.errno != errno.EADDRNOTAVAIL: - raise - elif conn.family == AF_UNIX: - self.assertEqual(conn.status, psutil.CONN_NONE) - - def check_type(conn): - # SOCK_SEQPACKET may happen in case of AF_UNIX socks - self.assertIn(conn.type, (SOCK_STREAM, SOCK_DGRAM, SOCK_SEQPACKET)) - if enum is not None: - assert isinstance(conn.type, enum.IntEnum), conn - else: - assert isinstance(conn.type, int), conn - if conn.type == SOCK_DGRAM: - self.assertEqual(conn.status, psutil.CONN_NONE) - - def check_addrs(conn): - # check IP address and port sanity - for addr in (conn.laddr, conn.raddr): - if conn.family in (AF_INET, AF_INET6): - self.assertIsInstance(addr, tuple) - if not addr: - continue - self.assertIsInstance(addr.port, int) - assert 0 <= addr.port <= 65535, addr.port - check_net_address(addr.ip, conn.family) - elif conn.family == AF_UNIX: - self.assertIsInstance(addr, str) - - def check_status(conn): - self.assertIsInstance(conn.status, str) - valids = [getattr(psutil, x) for x in dir(psutil) - if x.startswith('CONN_')] - self.assertIn(conn.status, valids) - if conn.family in (AF_INET, AF_INET6) and conn.type == SOCK_STREAM: - self.assertNotEqual(conn.status, psutil.CONN_NONE) - else: - self.assertEqual(conn.status, psutil.CONN_NONE) - - check_ntuple(conn) - check_family(conn) - check_type(conn) - check_addrs(conn) - check_status(conn) - -class TestBasicOperations(_ConnTestCase): +class TestBasicOperations(ConnectionTestCase): @unittest.skipIf(SKIP_SYSCONS, "requires root") def test_system(self): with create_sockets(): for conn in psutil.net_connections(kind='all'): - self.check_connection_ntuple(conn) + check_connection_ntuple(conn) def test_process(self): with create_sockets(): for conn in psutil.Process().connections(kind='all'): - self.check_connection_ntuple(conn) + check_connection_ntuple(conn) def test_invalid_kind(self): self.assertRaises(ValueError, thisproc.connections, kind='???') @@ -184,7 +108,7 @@ class TestBasicOperations(_ConnTestCase): @serialrun -class TestUnconnectedSockets(_ConnTestCase): +class TestUnconnectedSockets(ConnectionTestCase): """Tests sockets which are open but not connected to anything.""" def get_conn_from_sock(self, sock): @@ -206,7 +130,7 @@ class TestUnconnectedSockets(_ConnTestCase): only (the one supposed to be checked). """ conn = self.get_conn_from_sock(sock) - self.check_connection_ntuple(conn) + check_connection_ntuple(conn) # fd, family, type if conn.fd != -1: @@ -236,7 +160,7 @@ class TestUnconnectedSockets(_ConnTestCase): return conn def test_tcp_v4(self): - addr = ("127.0.0.1", get_free_port()) + addr = ("127.0.0.1", 0) with closing(bind_socket(AF_INET, SOCK_STREAM, addr=addr)) as sock: conn = self.check_socket(sock) assert not conn.raddr @@ -244,14 +168,14 @@ class TestUnconnectedSockets(_ConnTestCase): @unittest.skipIf(not supports_ipv6(), "IPv6 not supported") def test_tcp_v6(self): - addr = ("::1", get_free_port()) + addr = ("::1", 0) with closing(bind_socket(AF_INET6, SOCK_STREAM, addr=addr)) as sock: conn = self.check_socket(sock) assert not conn.raddr self.assertEqual(conn.status, psutil.CONN_LISTEN) def test_udp_v4(self): - addr = ("127.0.0.1", get_free_port()) + addr = ("127.0.0.1", 0) with closing(bind_socket(AF_INET, SOCK_DGRAM, addr=addr)) as sock: conn = self.check_socket(sock) assert not conn.raddr @@ -259,7 +183,7 @@ class TestUnconnectedSockets(_ConnTestCase): @unittest.skipIf(not supports_ipv6(), "IPv6 not supported") def test_udp_v6(self): - addr = ("::1", get_free_port()) + addr = ("::1", 0) with closing(bind_socket(AF_INET6, SOCK_DGRAM, addr=addr)) as sock: conn = self.check_socket(sock) assert not conn.raddr @@ -283,7 +207,7 @@ class TestUnconnectedSockets(_ConnTestCase): @serialrun -class TestConnectedSocket(_ConnTestCase): +class TestConnectedSocket(ConnectionTestCase): """Test socket pairs which are are actually connected to each other. """ @@ -292,7 +216,7 @@ class TestConnectedSocket(_ConnTestCase): # in TIME_WAIT state. @unittest.skipIf(SUNOS, "unreliable on SUONS") def test_tcp(self): - addr = ("127.0.0.1", get_free_port()) + addr = ("127.0.0.1", 0) assert not thisproc.connections(kind='tcp4') server, client = tcp_socketpair(AF_INET, addr=addr) try: @@ -347,7 +271,7 @@ class TestConnectedSocket(_ConnTestCase): client.close() -class TestFilters(_ConnTestCase): +class TestFilters(ConnectionTestCase): def test_filters(self): def check(kind, families, types): @@ -399,7 +323,7 @@ class TestFilters(_ConnTestCase): def check_conn(proc, conn, family, type, laddr, raddr, status, kinds): all_kinds = ("all", "inet", "inet4", "inet6", "tcp", "tcp4", "tcp6", "udp", "udp4", "udp6") - self.check_connection_ntuple(conn) + check_connection_ntuple(conn) self.assertEqual(conn.family, family) self.assertEqual(conn.type, type) self.assertEqual(conn.laddr, laddr) @@ -549,7 +473,7 @@ class TestFilters(_ConnTestCase): @unittest.skipIf(SKIP_SYSCONS, "requires root") -class TestSystemWideConnections(_ConnTestCase): +class TestSystemWideConnections(ConnectionTestCase): """Tests for net_connections().""" def test_it(self): @@ -558,7 +482,7 @@ class TestSystemWideConnections(_ConnTestCase): self.assertIn(conn.family, families, msg=conn) if conn.family != AF_UNIX: self.assertIn(conn.type, types_, msg=conn) - self.check_connection_ntuple(conn) + check_connection_ntuple(conn) with create_sockets(): from psutil._common import conn_tmap @@ -573,6 +497,8 @@ class TestSystemWideConnections(_ConnTestCase): # See: https://travis-ci.org/giampaolo/psutil/jobs/237566297 @unittest.skipIf(MACOS and TRAVIS, "unreliable on MACOS + TRAVIS") + # XXX + @unittest.skipIf(TRAVIS and PYTHON_39, "unreliable on TRAVIS + PYTHON_39") @retry_on_failure() def test_multi_sockets_procs(self): # Creates multiple sub processes, each creating different diff --git a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py index 659dc018..43eb9cbc 100755 --- a/psutil/tests/test_contracts.py +++ b/psutil/tests/test_contracts.py @@ -33,14 +33,16 @@ from psutil._compat import FileNotFoundError from psutil._compat import long from psutil._compat import range from psutil.tests import APPVEYOR +from psutil.tests import check_connection_ntuple from psutil.tests import create_sockets from psutil.tests import enum -from psutil.tests import GITHUB_WHEELS +from psutil.tests import GITHUB_ACTIONS from psutil.tests import HAS_CPU_FREQ from psutil.tests import HAS_NET_IO_COUNTERS from psutil.tests import HAS_SENSORS_FANS from psutil.tests import HAS_SENSORS_TEMPERATURES from psutil.tests import is_namedtuple +from psutil.tests import kernel_version from psutil.tests import process_namespace from psutil.tests import PsutilTestCase from psutil.tests import PYPY @@ -87,8 +89,9 @@ class TestAvailConstantsAPIs(PsutilTestCase): ae(hasattr(psutil, "IOPRIO_LOW"), WINDOWS) ae(hasattr(psutil, "IOPRIO_VERYLOW"), WINDOWS) - @unittest.skipIf(GITHUB_WHEELS, "not exposed via GITHUB_WHEELS") - def test_linux_rlimit(self): + @unittest.skipIf(GITHUB_ACTIONS and LINUX, + "unsupported on GITHUB_ACTIONS + LINUX") + def test_rlimit(self): ae = self.assertEqual ae(hasattr(psutil, "RLIM_INFINITY"), LINUX or FREEBSD) ae(hasattr(psutil, "RLIMIT_AS"), LINUX or FREEBSD) @@ -103,11 +106,17 @@ class TestAvailConstantsAPIs(PsutilTestCase): ae(hasattr(psutil, "RLIMIT_STACK"), LINUX or FREEBSD) ae(hasattr(psutil, "RLIMIT_LOCKS"), LINUX) - ae(hasattr(psutil, "RLIMIT_MSGQUEUE"), LINUX) # requires Linux 2.6.8 - ae(hasattr(psutil, "RLIMIT_NICE"), LINUX) # requires Linux 2.6.12 - ae(hasattr(psutil, "RLIMIT_RTPRIO"), LINUX) # requires Linux 2.6.12 - ae(hasattr(psutil, "RLIMIT_RTTIME"), LINUX) # requires Linux 2.6.25 - ae(hasattr(psutil, "RLIMIT_SIGPENDING"), LINUX) # requires Linux 2.6.8 + if POSIX: + if kernel_version() >= (2, 6, 8): + ae(hasattr(psutil, "RLIMIT_MSGQUEUE"), LINUX) + if kernel_version() >= (2, 6, 12): + ae(hasattr(psutil, "RLIMIT_NICE"), LINUX) + if kernel_version() >= (2, 6, 12): + ae(hasattr(psutil, "RLIMIT_RTPRIO"), LINUX) + if kernel_version() >= (2, 6, 25): + ae(hasattr(psutil, "RLIMIT_RTTIME"), LINUX) + if kernel_version() >= (2, 6, 8): + ae(hasattr(psutil, "RLIMIT_SIGPENDING"), LINUX) ae(hasattr(psutil, "RLIMIT_SWAP"), FREEBSD) ae(hasattr(psutil, "RLIMIT_SBSIZE"), FREEBSD) @@ -157,9 +166,9 @@ class TestAvailProcessAPIs(PsutilTestCase): def test_ionice(self): self.assertEqual(hasattr(psutil.Process, "ionice"), LINUX or WINDOWS) - @unittest.skipIf(GITHUB_WHEELS, "not exposed via GITHUB_WHEELS") + @unittest.skipIf(GITHUB_ACTIONS and LINUX, + "unsupported on GITHUB_ACTIONS + LINUX") def test_rlimit(self): - # requires Linux 2.6.36 self.assertEqual(hasattr(psutil.Process, "rlimit"), LINUX or FREEBSD) def test_io_counters(self): @@ -368,14 +377,15 @@ def proc_info(pid): name, ppid = d['name'], d['ppid'] info = {'pid': proc.pid} ns = process_namespace(proc) - with proc.oneshot(): - for fun, fun_name in ns.iter(ns.getters, clear_cache=False): - try: - info[fun_name] = fun() - except psutil.Error as exc: - check_exception(exc, proc, name, ppid) - continue - do_wait() + # We don't use oneshot() because in order not to fool + # check_exception() in case of NSP. + for fun, fun_name in ns.iter(ns.getters, clear_cache=False): + try: + info[fun_name] = fun() + except psutil.Error as exc: + check_exception(exc, proc, name, ppid) + continue + do_wait() return info @@ -619,6 +629,7 @@ class TestFetchAllProcesses(PsutilTestCase): self.assertEqual(len(ret), len(set(ret))) for conn in ret: assert is_namedtuple(conn) + check_connection_ntuple(conn) def cwd(self, ret, info): if ret: # 'ret' can be None or empty diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py index 519d4b2e..fbfa05a9 100755 --- a/psutil/tests/test_linux.py +++ b/psutil/tests/test_linux.py @@ -1975,7 +1975,7 @@ class TestProcess(PsutilTestCase): # Emulate a case where rlimit() raises ENOSYS, which may # happen in case of zombie process: # https://travis-ci.org/giampaolo/psutil/jobs/51368273 - with mock.patch("psutil._pslinux.cext.linux_prlimit", + with mock.patch("psutil._pslinux.prlimit", side_effect=OSError(errno.ENOSYS, "")) as m: p = psutil.Process() p.name() diff --git a/psutil/tests/test_memleaks.py b/psutil/tests/test_memleaks.py index cab91428..48a65dd5 100755 --- a/psutil/tests/test_memleaks.py +++ b/psutil/tests/test_memleaks.py @@ -243,7 +243,7 @@ class TestProcessObjectLeaks(TestMemoryLeak): def test_rlimit_set(self): limit = thisproc.rlimit(psutil.RLIMIT_NOFILE) self.execute(lambda: self.proc.rlimit(psutil.RLIMIT_NOFILE, limit)) - self.execute_w_exc(OSError, lambda: self.proc.rlimit(-1)) + self.execute_w_exc((OSError, ValueError), lambda: self.proc.rlimit(-1)) @fewtimes_if_linux() # Windows implementation is based on a single system-wide diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py index f4e1a5df..dac81859 100755 --- a/psutil/tests/test_misc.py +++ b/psutil/tests/test_misc.py @@ -17,6 +17,7 @@ import os import pickle import socket import stat +import sys from psutil import LINUX from psutil import POSIX @@ -48,6 +49,9 @@ import psutil import psutil.tests +PYTHON_39 = sys.version_info[:2] == (3, 9) + + # =================================================================== # --- Misc / generic tests. # =================================================================== @@ -60,7 +64,8 @@ class TestMisc(PsutilTestCase): r = func(p) self.assertIn("psutil.Process", r) self.assertIn("pid=%s" % p.pid, r) - self.assertIn("name='%s'" % p.name(), r) + self.assertIn("name='%s'" % str(p.name()), + r.replace("name=u'", "name='")) self.assertIn("status=", r) self.assertNotIn("exitcode=", r) p.terminate() @@ -633,6 +638,8 @@ class TestWrapNumbers(PsutilTestCase): @unittest.skipIf(not os.path.exists(SCRIPTS_DIR), "can't locate scripts directory") +# XXX +@unittest.skipIf(TRAVIS and PYTHON_39, "unreliable on TRAVIS + PYTHON_39") class TestScripts(PsutilTestCase): """Tests for scripts in the "scripts" directory.""" diff --git a/psutil/tests/test_posix.py b/psutil/tests/test_posix.py index e2d18ccb..54cf5ceb 100755 --- a/psutil/tests/test_posix.py +++ b/psutil/tests/test_posix.py @@ -371,6 +371,7 @@ class TestSystemAPIs(PsutilTestCase): # AIX can return '-' in df output instead of numbers, e.g. for /proc @unittest.skipIf(AIX, "unreliable on AIX") + @retry_on_failure() def test_disk_usage(self): def df(device): out = sh("df -k %s" % device).strip() diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py index 33fcbf84..bf301ed0 100755 --- a/psutil/tests/test_process.py +++ b/psutil/tests/test_process.py @@ -43,7 +43,7 @@ from psutil.tests import CI_TESTING from psutil.tests import CIRRUS from psutil.tests import copyload_shared_lib from psutil.tests import create_exe -from psutil.tests import GITHUB_WHEELS +from psutil.tests import GITHUB_ACTIONS from psutil.tests import GLOBAL_TIMEOUT from psutil.tests import HAS_CPU_AFFINITY from psutil.tests import HAS_ENVIRON @@ -1274,7 +1274,7 @@ class TestProcess(PsutilTestCase): assert_raises_nsp(fun, name) # NtQuerySystemInformation succeeds even if process is gone. - if WINDOWS and not GITHUB_WHEELS: + if WINDOWS and not GITHUB_ACTIONS: normcase = os.path.normcase self.assertEqual(normcase(p.exe()), normcase(PYTHON_EXE)) @@ -1398,7 +1398,7 @@ class TestProcess(PsutilTestCase): p = psutil.Process() d1 = clean_dict(p.environ()) d2 = clean_dict(os.environ.copy()) - if not OSX and GITHUB_WHEELS: + if not OSX and GITHUB_ACTIONS: self.assertEqual(d1, d2) @unittest.skipIf(not HAS_ENVIRON, "not supported") diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py index 872b8988..69f318b4 100755 --- a/psutil/tests/test_system.py +++ b/psutil/tests/test_system.py @@ -49,7 +49,7 @@ from psutil.tests import PsutilTestCase from psutil.tests import PYPY from psutil.tests import retry_on_failure from psutil.tests import TRAVIS -from psutil.tests import GITHUB_WHEELS +from psutil.tests import GITHUB_ACTIONS from psutil.tests import UNICODE_SUFFIX from psutil.tests import unittest @@ -599,7 +599,7 @@ class TestDiskAPIs(PsutilTestCase): self.assertIsInstance(nt.opts, str) self.assertIsInstance(nt.maxfile, (int, type(None))) self.assertIsInstance(nt.maxpath, (int, type(None))) - if nt.maxfile is not None: + if nt.maxfile is not None and not GITHUB_ACTIONS: self.assertGreater(nt.maxfile, 0) if nt.maxpath is not None: self.assertGreater(nt.maxpath, 0) @@ -633,7 +633,7 @@ class TestDiskAPIs(PsutilTestCase): try: os.stat(disk.mountpoint) except OSError as err: - if (GITHUB_WHEELS or TRAVIS) and \ + if (GITHUB_ACTIONS or TRAVIS) and \ MACOS and err.errno == errno.EIO: continue # http://mail.python.org/pipermail/python-dev/ diff --git a/psutil/tests/test_windows.py b/psutil/tests/test_windows.py index 580e1e5e..a9254e2c 100755 --- a/psutil/tests/test_windows.py +++ b/psutil/tests/test_windows.py @@ -24,7 +24,7 @@ from psutil import WINDOWS from psutil._compat import FileNotFoundError from psutil._compat import super from psutil.tests import APPVEYOR -from psutil.tests import GITHUB_WHEELS +from psutil.tests import GITHUB_ACTIONS from psutil.tests import HAS_BATTERY from psutil.tests import IS_64BIT from psutil.tests import mock @@ -68,8 +68,7 @@ def wrap_exceptions(fun): @unittest.skipIf(not WINDOWS, "WINDOWS only") @unittest.skipIf(PYPY, "pywin32 not available on PYPY") # https://github.com/giampaolo/psutil/pull/1762#issuecomment-632892692 -@unittest.skipIf(GITHUB_WHEELS and (not PY3 or not IS_64BIT), - "pywin32 broken on GITHUB + PY2") +@unittest.skipIf(GITHUB_ACTIONS and not PY3, "pywin32 broken on GITHUB + PY2") class WindowsTestCase(PsutilTestCase): pass @@ -512,7 +511,7 @@ class TestProcessWMI(WindowsTestCase): self.assertEqual(p.name(), w.Caption) # This fail on github because using virtualenv for test environment - @unittest.skipIf(GITHUB_WHEELS, "unreliable path on GITHUB_WHEELS") + @unittest.skipIf(GITHUB_ACTIONS, "unreliable path on GITHUB_ACTIONS") def test_exe(self): w = wmi.WMI().Win32_Process(ProcessId=self.pid)[0] p = psutil.Process(self.pid) diff --git a/scripts/internal/download_wheels_appveyor.py b/scripts/internal/download_wheels_appveyor.py index a6773f34..83ea55a1 100755 --- a/scripts/internal/download_wheels_appveyor.py +++ b/scripts/internal/download_wheels_appveyor.py @@ -66,7 +66,7 @@ def get_file_urls(options): yield url -def rename_27_wheels(): +def rename_win27_wheels(): # See: https://github.com/giampaolo/psutil/issues/810 src = 'dist/psutil-%s-cp27-cp27m-win32.whl' % PSUTIL_VERSION dst = 'dist/psutil-%s-cp27-none-win32.whl' % PSUTIL_VERSION @@ -101,7 +101,7 @@ def run(options): return exit("expected %s files, got %s" % (expected, completed)) if exc: return exit() - rename_27_wheels() + rename_win27_wheels() def main(): diff --git a/scripts/internal/download_wheels_github.py b/scripts/internal/download_wheels_github.py index 4aa50d5d..5623bb59 100644..100755 --- a/scripts/internal/download_wheels_github.py +++ b/scripts/internal/download_wheels_github.py @@ -21,6 +21,7 @@ import os import requests import zipfile +from psutil import __version__ as PSUTIL_VERSION from psutil._common import bytes2human from psutil.tests import safe_rmpath @@ -52,12 +53,25 @@ def download_zip(url): print("got %s, size %s)" % (OUTFILE, bytes2human(totbytes))) +def rename_win27_wheels(): + # See: https://github.com/giampaolo/psutil/issues/810 + src = 'dist/psutil-%s-cp27-cp27m-win32.whl' % PSUTIL_VERSION + dst = 'dist/psutil-%s-cp27-none-win32.whl' % PSUTIL_VERSION + print("rename: %s\n %s" % (src, dst)) + os.rename(src, dst) + src = 'dist/psutil-%s-cp27-cp27m-win_amd64.whl' % PSUTIL_VERSION + dst = 'dist/psutil-%s-cp27-none-win_amd64.whl' % PSUTIL_VERSION + print("rename: %s\n %s" % (src, dst)) + os.rename(src, dst) + + def run(): data = get_artifacts() download_zip(data['artifacts'][0]['archive_download_url']) os.makedirs('dist', exist_ok=True) with zipfile.ZipFile(OUTFILE, 'r') as zf: zf.extractall('dist') + rename_win27_wheels() def main(): diff --git a/scripts/internal/generate_manifest.py b/scripts/internal/generate_manifest.py index c0be6d99..f760dd65 100755 --- a/scripts/internal/generate_manifest.py +++ b/scripts/internal/generate_manifest.py @@ -13,8 +13,8 @@ import subprocess SKIP_EXTS = ('.png', '.jpg', '.jpeg') -SKIP_FILES = ('.travis.yml', 'appveyor.yml') -SKIP_PREFIXES = ('.ci/', '.github/') +SKIP_FILES = ('.cirrus.yml', '.travis.yml', 'appveyor.yml') +SKIP_PREFIXES = ('.ci/', '.github/', 'scripts/internal/') def sh(cmd): diff --git a/scripts/internal/print_announce.py b/scripts/internal/print_announce.py index 180bf377..c9948c1d 100755 --- a/scripts/internal/print_announce.py +++ b/scripts/internal/print_announce.py @@ -6,16 +6,22 @@ """ Prints release announce based on HISTORY.rst file content. +See: https://pip.pypa.io/en/stable/reference/pip_install/#hash-checking-mode """ import os import re +import subprocess +import sys from psutil import __version__ as PRJ_VERSION HERE = os.path.abspath(os.path.dirname(__file__)) -HISTORY = os.path.abspath(os.path.join(HERE, '../../HISTORY.rst')) +ROOT = os.path.realpath(os.path.join(HERE, '..', '..')) +HISTORY = os.path.join(ROOT, 'HISTORY.rst') +PRINT_HASHES_SCRIPT = os.path.join( + ROOT, 'scripts', 'internal', 'print_hashes.py') PRJ_NAME = 'psutil' PRJ_URL_HOME = 'https://github.com/giampaolo/psutil' @@ -56,6 +62,11 @@ Links - Documentation: {prj_urldoc} - What's new: {prj_urlwhatsnew} +Hashes +====== + +{hashes} + -- Giampaolo - https://gmpy.dev/about @@ -100,6 +111,8 @@ def get_changes(): def main(): changes = get_changes() + hashes = subprocess.check_output( + [sys.executable, PRINT_HASHES_SCRIPT, 'dist/']).strip().decode() print(template.format( prj_name=PRJ_NAME, prj_version=PRJ_VERSION, @@ -108,6 +121,7 @@ def main(): prj_urldoc=PRJ_URL_DOC, prj_urlwhatsnew=PRJ_URL_WHATSNEW, changes=changes, + hashes=hashes, )) diff --git a/scripts/internal/print_hashes.py b/scripts/internal/print_hashes.py new file mode 100755 index 00000000..434c43d5 --- /dev/null +++ b/scripts/internal/print_hashes.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python3 + +# Copyright (c) 2009 Giampaolo Rodola'. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +""" +Prints files hashes. +See: https://pip.pypa.io/en/stable/reference/pip_install/#hash-checking-mode +""" + +import hashlib +import os +import sys + + +def csum(file, kind): + h = hashlib.new(kind) + with open(file, "rb") as f: + h.update(f.read()) + return h.hexdigest() + + +def main(): + dir = sys.argv[1] + for name in sorted(os.listdir(dir)): + file = os.path.join(dir, name) + md5 = csum(file, "md5") + sha256 = csum(file, "sha256") + print("%s\nmd5: %s\nsha256: %s\n" % ( + os.path.basename(file), md5, sha256)) + + +if __name__ == "__main__": + main() diff --git a/scripts/internal/print_wheels.py b/scripts/internal/print_wheels.py index be8290e0..3c966173 100644..100755 --- a/scripts/internal/print_wheels.py +++ b/scripts/internal/print_wheels.py @@ -42,16 +42,18 @@ def main(): else: assert 0, name - totsize = 0 + tot_files = 0 + tot_size = 0 templ = "%-54s %7s %7s %7s" for platf, names in groups.items(): ppn = "%s (total = %s)" % (platf.replace('_', ' '), len(names)) s = templ % (ppn, "size", "arch", "pyver") print_color('\n' + s, color=None, bold=True) for name in sorted(names): + tot_files += 1 path = os.path.join('dist', name) size = os.path.getsize(path) - totsize += size + tot_size += size arch = '64' if is64bit(name) else '32' pyver = 'pypy' if name.split('-')[3].startswith('pypy') else 'py' pyver += name.split('-')[2][2:] @@ -61,6 +63,9 @@ def main(): else: print_color(s, color='brown') + print_color("\ntotals: files=%s, size=%s" % ( + tot_files, bytes2human(tot_size)), bold=1) + if __name__ == '__main__': main() diff --git a/scripts/procinfo.py b/scripts/procinfo.py index 8eea3377..743a1777 100755 --- a/scripts/procinfo.py +++ b/scripts/procinfo.py @@ -102,7 +102,6 @@ RLIMITS_MAP = { "RLIMIT_CPU": "cputime", "RLIMIT_DATA": "datasize", "RLIMIT_FSIZE": "filesize", - "RLIMIT_LOCKS": "locks", "RLIMIT_MEMLOCK": "memlock", "RLIMIT_MSGQUEUE": "msgqueue", "RLIMIT_NICE": "nice", @@ -430,14 +430,6 @@ def main(): elif SUNOS: missdeps("sudo ln -s /usr/bin/gcc /usr/local/bin/cc && " "pkg install gcc") - elif not success and WINDOWS: - if PY3: - ur = "http://www.visualstudio.com/en-au/news/vs2015-preview-vs" - else: - ur = "http://www.microsoft.com/en-us/download/" - ur += "details.aspx?id=44266" - s = "VisualStudio is not installed; get it from %s" % ur - print(hilite(s, color="red"), file=sys.stderr) if __name__ == '__main__': |