Backed out changeset 697eb6db7d96 (bug 930808) for OS X make check failures

python/psutil/examples/disk_usage.py

@@ -6,13 +6,6 @@
 
 """
 List all mounted disk partitions a-la "df -h" command.
-
-$ python examples/disk_usage.py
-Device               Total     Used     Free  Use %      Type  Mount
-/dev/sdb3            18.9G    14.7G     3.3G    77%      ext4  /
-/dev/sda6           345.9G    83.8G   244.5G    24%      ext4  /home
-/dev/sda1           296.0M    43.1M   252.9M    14%      vfat  /boot/efi
-/dev/sda2           600.0M   312.4M   287.6M    52%   fuseblk  /media/Recovery
 """
 
 import sys
@@ -20,7 +13,6 @@ import os
 import psutil
 from psutil._compat import print_
 
-
 def bytes2human(n):
     # http://code.activestate.com/recipes/578019
     # >>> bytes2human(10000)
@@ -30,7 +22,7 @@ def bytes2human(n):
     symbols = ('K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y')
     prefix = {}
     for i, s in enumerate(symbols):
-        prefix[s] = 1 << (i + 1) * 10
+        prefix[s] = 1 << (i+1)*10
     for s in reversed(symbols):
         if n >= prefix[s]:
             value = float(n) / prefix[s]
@@ -40,24 +32,19 @@ def bytes2human(n):
 
 def main():
     templ = "%-17s %8s %8s %8s %5s%% %9s  %s"
-    print_(templ % ("Device", "Total", "Used", "Free", "Use ", "Type",
-                    "Mount"))
+    print_(templ % ("Device", "Total", "Used", "Free", "Use ", "Type", "Mount"))
     for part in psutil.disk_partitions(all=False):
-        if os.name == 'nt':
-            if 'cdrom' in part.opts or part.fstype == '':
-                # skip cd-rom drives with no disk in it; they may raise
-                # ENOENT, pop-up a Windows GUI error for a non-ready
-                # partition or just hang.
-                continue
+        if os.name == 'nt' and 'cdrom' in part.opts:
+            # may raise ENOENT if there's no cd-rom in the drive
+            continue
         usage = psutil.disk_usage(part.mountpoint)
-        print_(templ % (
-            part.device,
-            bytes2human(usage.total),
-            bytes2human(usage.used),
-            bytes2human(usage.free),
-            int(usage.percent),
-            part.fstype,
-            part.mountpoint))
+        print_(templ % (part.device,
+                        bytes2human(usage.total),
+                        bytes2human(usage.used),
+                        bytes2human(usage.free),
+                        int(usage.percent),
+                        part.fstype,
+                        part.mountpoint))
 
 if __name__ == '__main__':
     sys.exit(main())