another small refactoring + test fix on OSX
another small refactoring + test fix on OSX

cloudbase/psutil,jorik041/psutil,0-wiz-0/psutil,landryb/psutil,jamesblunt/psutil,mrjefftang/psutil,Q-Leap-Networks/psutil,packages/psutil,packages/psutil,landryb/psutil,msarahan/psutil,qbit/psutil,tomprince/psutil,mindw/psutil,mindw/psutil,giampaolo/psutil,msarahan/psutil,packages/psutil,tomprince/psutil,landryb/psutil,landryb/psutil,qbit/psutil,giampaolo/psutil,qbit/psutil,0-wiz-0/psutil,jorik041/psutil,tomprince/psutil,landryb/psutil,tomprince/psutil,mindw/psutil,mrjefftang/psutil,jamesblunt/psutil,jorik041/psutil,cloudbase/psutil,mrjefftang/psutil,msarahan/psutil,mindw/psutil,mindw/psutil,cloudbase/psutil,jamesblunt/psutil,tomprince/psutil,Q-Leap-Networks/psutil