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

This commit is contained in:
Joel Maher
2015-08-20 08:03:31 -04:00
parent e27f1455ab
commit 6fabf5a7a3
73 changed files with 6544 additions and 3863 deletions

View File

@@ -23,7 +23,6 @@ import socket
from socket import AF_INET, SOCK_STREAM, SOCK_DGRAM
import psutil
from psutil._compat import print_
AD = "-"
@@ -38,7 +37,7 @@ proto_map = {
def main():
templ = "%-5s %-30s %-30s %-13s %-6s %s"
print_(templ % (
print(templ % (
"Proto", "Local address", "Remote address", "Status", "PID",
"Program name"))
proc_names = {}
@@ -52,7 +51,7 @@ def main():
raddr = ""
if c.raddr:
raddr = "%s:%s" % (c.raddr)
print_(templ % (
print(templ % (
proto_map[(c.family, c.type)],
laddr,
raddr or AD,