Merge remote-tracking branch 'giampaolo/master'

* giampaolo/master: (33 commits)
  fix appveyor failure
  update TODO + GIT pre-commit script
  #678_ setup.py error on linux
  reverse change - don't call safe_remove on APPVEYOR
  fix review comments
  update history and credits
  giampaolo#517 The data type retrurned from kstat is interface dependent and not system dependent
  Fix giampaolo#517 by testing ksp->ks_name is a network interface instead of testing ksp->ks_module is 'link'
  avoid name cutoff in tests
  use os.path.normcase for Windows exe tests
  TestUnicode: Instead of using Python's executable, compile one if possible
  Fix test_memory_leaks
  Code review fixes
  fix test on Solaris
  fix test on Solaris
  fix test on Solaris
  fix test on Solaris
  swap -k is not supported in Solaris 10
  Add ifaddrs.c for Solaris 10
  move DUPLEX_UNKOWN fix outside of #if PSUTIL_HAVE_IOPRIO
  ...

.git-pre-commit

@@ -38,7 +38,7 @@ def main():
     # flake8
     failed = False
     for path in files:
-        ret = subprocess.call("flake8 %s" % path, shell=True)
+        ret = subprocess.call("python -m flake8 %s" % path, shell=True)
         if ret != 0:
             failed = True
     if failed:

CREDITS

@@ -325,3 +325,7 @@ I: 670
 N: maozguttman
 W: https://github.com/maozguttman
 I: 659
+
+N: wiggin15
+W: https://github.com/wiggin15
+I: 517, 607, 610

HISTORY.rst

@@ -1,5 +1,24 @@
 Bug tracker at https://github.com/giampaolo/psutil/issues
 
+3.2.2 - XXXX-XX-XX
+==================
+
+**Bug fixes**
+
+- #517: [SunOS] net_io_counters failed to detect network interfaces
+  correctly on Solaris 10
+- #610: [SunOS] fix build and tests on Solaris 10
+- #678: [Linux] can't install psutil due to bug in setup.py.
+
+
+3.2.1 - 2015-09-03
+==================
+
+**Bug fixes**
+
+- #677: [Linux] can't install psutil due to bug in setup.py.
+
+
 3.2.0 - 2015-09-02
 ==================
 

README.rst

@@ -350,7 +350,8 @@ http://groups.google.com/group/psutil/
 Timeline
 ========
 
-- 2015-09-02: `psutil-3.1.1.tar.gz <https://pypi.python.org/packages/source/p/psutil/psutil-3.2.0.tar.gz>`_
+- 2015-09-03: `psutil-3.2.1.tar.gz <https://pypi.python.org/packages/source/p/psutil/psutil-3.2.1.tar.gz>`_
+- 2015-09-02: `psutil-3.2.0.tar.gz <https://pypi.python.org/packages/source/p/psutil/psutil-3.2.0.tar.gz>`_
 - 2015-07-15: `psutil-3.1.1.tar.gz <https://pypi.python.org/packages/source/p/psutil/psutil-3.1.1.tar.gz>`_
 - 2015-07-15: `psutil-3.1.0.tar.gz <https://pypi.python.org/packages/source/p/psutil/psutil-3.1.0.tar.gz>`_
 - 2015-06-18: `psutil-3.0.1.tar.gz <https://pypi.python.org/packages/source/p/psutil/psutil-3.0.1.tar.gz>`_

TODO

@@ -6,11 +6,25 @@ A collection of ideas and notes about stuff to implement in future versions.
 https://github.com/giampaolo/psutil/issues
 
 
+PLATFORMS
+=========
+
+ * #615 (PR): OpenBSD
+
+ * #355 (patch): Android
+
+ * #429 (patch): NetBSD
+
+ * #605 (branch): AIX
+
+ * #276: GNU/Hurd
+
+ * DragonFlyBSD
+
+
 HIGHER PRIORITY
 ===============
 
- * OpenBSD support.
-
  * #371: CPU temperature (apparently OSX and Linux only; on Linux it requires
    lm-sensors lib).
 
@@ -36,16 +50,6 @@ HIGHER PRIORITY
 LOWER PRIORITY
 ==============
 
- * #355: Android support.
-
- * #276: GNU/Hurd support.
-
- * #429: NetBSD support.
-
- * DragonFlyBSD support?
-
- * AIX support?
-
  * examples/taskmgr-gui.py (using tk).
 
  * system-wide number of open file descriptors:

docs/index.rst

@@ -1184,7 +1184,7 @@ Process class
      `signal module <http://docs.python.org//library/signal.html>`__
      constants) pre-emptively checking whether PID has been reused.
      On UNIX this is the same as ``os.kill(pid, sig)``.
-     On Windows only **SIGTERM**, **CTRL_C_EVENT ** and **CTRL_BREAK_EVENT**
+     On Windows only **SIGTERM**, **CTRL_C_EVENT** and **CTRL_BREAK_EVENT**
      signals are supported and **SIGTERM** is treated as an alias for
      :meth:`kill()`.
 

make.bat

@@ -64,6 +64,7 @@ if "%1" == "clean" (
     for /r %%R in (__pycache__) do if exist %%R (rmdir /S /Q %%R)
     for /r %%R in (*.pyc) do if exist %%R (del /s %%R)
     for /r %%R in (*.pyd) do if exist %%R (del /s %%R)
+    for /r %%R in (*.obj) do if exist %%R (del /s %%R)
     for /r %%R in (*.orig) do if exist %%R (del /s %%R)
     for /r %%R in (*.bak) do if exist %%R (del /s %%R)
     for /r %%R in (*.rej) do if exist %%R (del /s %%R)

psutil/__init__.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
@@ -158,7 +157,7 @@
 ]
 __all__.extend(_psplatform.__extra__all__)
 __author__ = "Giampaolo Rodola'"
-__version__ = "3.2.0"
+__version__ = "3.2.2"
 version_info = tuple([int(num) for num in __version__.split('.')])
 AF_LINK = _psplatform.AF_LINK
 _TOTAL_PHYMEM = None

psutil/_compat.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 # 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.

psutil/_psbsd.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 # 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.

psutil/_pslinux.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 # 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.

psutil/_psosx.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 # 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.

psutil/_psposix.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 # 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.

psutil/_pssunos.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 # 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.
@@ -97,13 +95,13 @@ def swap_memory():
     # ...nevertheless I can't manage to obtain the same numbers as 'swap'
     # cmdline utility, so let's parse its output (sigh!)
     p = subprocess.Popen(['/usr/bin/env', 'PATH=/usr/sbin:/sbin:%s' %
-                          os.environ['PATH'], 'swap', '-l', '-k'],
+                          os.environ['PATH'], 'swap', '-l'],
                          stdout=subprocess.PIPE)
     stdout, stderr = p.communicate()
     if PY3:
         stdout = stdout.decode(sys.stdout.encoding)
     if p.returncode != 0:
-        raise RuntimeError("'swap -l -k' failed (retcode=%s)" % p.returncode)
+        raise RuntimeError("'swap -l' failed (retcode=%s)" % p.returncode)
 
     lines = stdout.strip().split('\n')[1:]
     if not lines:
@@ -112,10 +110,8 @@ def swap_memory():
     for line in lines:
         line = line.split()
         t, f = line[-2:]
-        t = t.replace('K', '')
-        f = f.replace('K', '')
-        total += int(int(t) * 1024)
-        free += int(int(f) * 1024)
+        total += int(int(t) * 512)
+        free += int(int(f) * 512)
     used = total - free
     percent = usage_percent(used, total, _round=1)
     return _common.sswap(total, used, free, percent,