From a7c8026a73ab0fc3dda48b30c289ff31a5aa31f7 Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Thu, 13 Mar 2008 19:04:20 +0000 Subject: [PATCH] Took out the get_devices code and moved it to pypcilib. Changed import statement. --- source/systeminfo.py | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/source/systeminfo.py b/source/systeminfo.py index 9997342..3499306 100755 --- a/source/systeminfo.py +++ b/source/systeminfo.py @@ -26,27 +26,7 @@ import popen2 import re import errno import ModelOptions -try: - from pypciscan import get_devices -except: - def get_devices(): - """ This is a replacement to the version in pypciscan library for 3.3 and lower bootcds - that will help maintain backward compatibility. This version has limitations wrt accuracy - that the library does not. In particular it is limited to the output of - lspci and 'forces' all devices to appear on the '0000' domain, rather than - where they actually are.""" - - ret = {} - #pci = os.popen("lspci -nm | sed -e 's/\"//g'", 'r') - pci = os.popen("lspci -nm | sed -e 's/\"//g' -e 's/Class //g'", 'r') - for line in pci: - l = line[:-1] - f = l.split(" ") - key = "0000:%s" % f[0] - ret[key] = (int(f[2],16), int(f[3],16), 0xffff, 0xffff, int(f[1],16) << 8) - return ret - -import pypcimap +from pypci import * from Exceptions import * """ -- 2.43.0