Bug 1196253 - update in-tree psutil to 3.1.1. r=gps

2015-08-20 08:03:31 -04:00
parent e27f1455ab
commit 6fabf5a7a3
73 changed files with 6544 additions and 3863 deletions
--- a/python/psutil/examples/nettop.py
+++ b/python/psutil/examples/nettop.py
@@ -31,13 +31,13 @@ pkts-sent                     0               0
 pkts-recv               1214470               0
 """

-import sys
-import os
-if os.name != 'posix':
-    sys.exit('platform not supported')
 import atexit
-import curses
 import time
+import sys
+try:
+    import curses
+except ImportError:
+    sys.exit('platform not supported')

 import psutil