Merge branch '941-cpu-freq' of github.com:giampaolo/psutil into 941-cpu-freq

2 files changed, 5 insertions, 3 deletions

diff --git a/psutil/tests/test_windows.py b/psutil/tests/test_windows.py
index 2b466382..07f1d796 100755
--- a/psutil/tests/test_windows.py
+++ b/psutil/tests/test_windows.py
@@ -88,8 +88,8 @@ class TestSystemAPIs(unittest.TestCase):
     def test_cpu_freq(self):
         w = wmi.WMI()
         proc = w.Win32_Processor()[0]
-        self.assertEqual(proc.CurrentClockSpeed, psutil.cpu_freq()[0].curr)
-        self.assertEqual(proc.MaxClockSpeed, psutil.cpu_freq()[0].max)
+        self.assertEqual(proc.CurrentClockSpeed, psutil.cpu_freq().current)
+        self.assertEqual(proc.MaxClockSpeed, psutil.cpu_freq().max)
 
     def test_total_phymem(self):
         w = wmi.WMI().Win32_ComputerSystem()[0]
diff --git a/scripts/internal/winmake.py b/scripts/internal/winmake.py
index e2c1f086..8ce51ed0 100755
--- a/scripts/internal/winmake.py
+++ b/scripts/internal/winmake.py
@@ -225,11 +225,12 @@ def install():
 @cmd
 def uninstall():
     """Uninstall psutil"""
-    clean()
     try:
         import psutil
     except ImportError:
+        clean()
         return
+    clean()
     install_pip()
     sh("%s -m pip uninstall -y psutil" % PYTHON)
 
@@ -244,6 +245,7 @@ def uninstall():
             try:
                 import psutil  # NOQA
             except ImportError:
+                clean()
                 return
             sh("%s -m pip uninstall -y psutil" % PYTHON)
     finally: