summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2016-10-27 19:07:57 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2016-10-27 19:07:57 +0200
commitae7ceba3af580d5ea8682a17bd127ab68521ef95 (patch)
tree5cbf13ae33a69637e6617b6a92ebf41bccf5c9e8
parent68ba1914ab796d9504c1e9e0ed1d2375a4792970 (diff)
parent7f51f0074b6d727a01fea0290ed0988dd51ad288 (diff)
downloadpsutil-ae7ceba3af580d5ea8682a17bd127ab68521ef95.tar.gz
Merge branch 'oneshot' into oneshot-win
-rwxr-xr-xscripts/internal/bench_oneshot.py4
-rw-r--r--scripts/internal/bench_oneshot_2.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/internal/bench_oneshot.py b/scripts/internal/bench_oneshot.py
index 2ef21729..d63cb349 100755
--- a/scripts/internal/bench_oneshot.py
+++ b/scripts/internal/bench_oneshot.py
@@ -121,8 +121,8 @@ setup = textwrap.dedent("""
def main():
- print("%s methods involved on platform %r (%s iterations):" % (
- len(names), sys.platform, ITERATIONS))
+ print("%s methods involved on platform %r (%s iterations, psutil %s):" % (
+ len(names), sys.platform, ITERATIONS, psutil.__version__))
for name in sorted(names):
print(" " + name)
diff --git a/scripts/internal/bench_oneshot_2.py b/scripts/internal/bench_oneshot_2.py
index c751a585..a25d1806 100644
--- a/scripts/internal/bench_oneshot_2.py
+++ b/scripts/internal/bench_oneshot_2.py
@@ -41,8 +41,8 @@ def main():
args = runner.parse_args()
if not args.worker:
- print("%s methods involved on platform %r:" % (
- len(names), sys.platform))
+ print("%s methods involved on platform %r (psutil %s):" % (
+ len(names), sys.platform, psutil.__version__))
for name in sorted(names):
print(" " + name)