diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2019-05-08 20:29:00 +0800 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2019-05-08 20:29:00 +0800 |
commit | 8b6ffeec13306701c788bc0442bc77cd05651974 (patch) | |
tree | eb9a9c734ae5e8fd014512ae43ced8065a688ade | |
parent | 43a22b81832f7ba546636c26006190bc2bb8dfc2 (diff) | |
download | psutil-8b6ffeec13306701c788bc0442bc77cd05651974.tar.gz |
update CREDITS + small style fix
-rw-r--r-- | CREDITS | 2 | ||||
-rw-r--r-- | HISTORY.rst | 13 | ||||
-rw-r--r-- | docs/index.rst | 1 | ||||
-rw-r--r-- | psutil/__init__.py | 2 | ||||
-rw-r--r-- | psutil/_psaix.py | 6 | ||||
-rwxr-xr-x | psutil/tests/test_linux.py | 5 |
6 files changed, 19 insertions, 10 deletions
@@ -57,7 +57,7 @@ N: Arnon Yaari (wiggin15) W: https://github.com/wiggin15 D: AIX implementation, expert on multiple fronts I: 517, 607, 610, 1131, 1123, 1130, 1154, 1164, 1174, 1177, 1210, 1214, 1408, - 1329. + 1329, 1276, 1494. N: Alex Manuskin W: https://github.com/amanusk diff --git a/HISTORY.rst b/HISTORY.rst index 26fc5b0e..36977cbc 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,5 +1,18 @@ *Bug tracker at https://github.com/giampaolo/psutil/issues* +5.6.3 +===== + +XXXX-XX-XX + +**Enhancements** + +- 1494_: [AIX] added support for Process.environ(). (patch by Arnon Yaari) + +**Bug fixes** + +- 1276_: [AIX] can't get whole cmdline(). (patch by Arnon Yaari) + 5.6.2 ===== diff --git a/docs/index.rst b/docs/index.rst index 967d7bdf..ede2b3f9 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1136,6 +1136,7 @@ Process class .. versionadded:: 4.0.0 .. versionchanged:: 5.3.0 added SunOS support + .. versionchanged:: 5.6.3 added AIX suport .. method:: create_time() diff --git a/psutil/__init__.py b/psutil/__init__.py index 5d37c5c0..0e4a8de9 100644 --- a/psutil/__init__.py +++ b/psutil/__init__.py @@ -221,7 +221,7 @@ __all__ = [ __all__.extend(_psplatform.__extra__all__) __author__ = "Giampaolo Rodola'" -__version__ = "5.6.2" +__version__ = "5.6.3" version_info = tuple([int(num) for num in __version__.split('.')]) _timer = getattr(time, 'monotonic', time.time) diff --git a/psutil/_psaix.py b/psutil/_psaix.py index 5810e3b4..b24325d1 100644 --- a/psutil/_psaix.py +++ b/psutil/_psaix.py @@ -396,8 +396,8 @@ class Process(object): # if cwd has changed, we're out of luck - this may be wrong! exe = os.path.abspath(os.path.join(self.cwd(), exe)) if (os.path.isabs(exe) and - os.path.isfile(exe) and - os.access(exe, os.X_OK)): + os.path.isfile(exe) and + os.access(exe, os.X_OK)): return exe # not found, move to search in PATH using basename only exe = os.path.basename(exe) @@ -405,7 +405,7 @@ class Process(object): for path in os.environ["PATH"].split(":"): possible_exe = os.path.abspath(os.path.join(path, exe)) if (os.path.isfile(possible_exe) and - os.access(possible_exe, os.X_OK)): + os.access(possible_exe, os.X_OK)): return possible_exe return '' diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py index a4b79e4f..d732e90d 100755 --- a/psutil/tests/test_linux.py +++ b/psutil/tests/test_linux.py @@ -696,11 +696,6 @@ class TestSystemCPUCountPhysical(unittest.TestCase): @unittest.skipIf(not LINUX, "LINUX only") class TestSystemCPUFrequency(unittest.TestCase): - @unittest.skipIf(not HAS_CPU_FREQ, "not supported") - def test_emulate_no_files(self): - with mock.patch("os.path.exists", return_value=False): - self.assertIsNone(psutil.cpu_freq()) - @unittest.skipIf(TRAVIS, "fails on Travis") @unittest.skipIf(not HAS_CPU_FREQ, "not supported") def test_emulate_use_second_file(self): |