Use os.path.join instead of + '/'. The script is Linux only but it is
still cleaner.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
@staticmethod
def parse_pcicaps(dir):
caps = []
@staticmethod
def parse_pcicaps(dir):
caps = []
- f = input_open(dir + '/config', 'rb')
+ f = input_open(os.path.join(dir, 'config'), 'rb')
f.seek(0x06)
(status,) = struct.unpack('<H', f.read(2))
# capability list supported?
f.seek(0x06)
(status,) = struct.unpack('<H', f.read(2))
# capability list supported?
@staticmethod
def parse_pcidevice_sysfsdir(basedir, dir):
@staticmethod
def parse_pcidevice_sysfsdir(basedir, dir):
- dpath = basedir + '/' + dir
- dclass = input_readline(dpath + '/class')
+ dpath = os.path.join(basedir, dir)
+ dclass = input_readline(os.path.join(dpath, 'class'))
if re.match(r'0x0604..', dclass):
type = 'JAILHOUSE_PCI_TYPE_BRIDGE'
else:
if re.match(r'0x0604..', dclass):
type = 'JAILHOUSE_PCI_TYPE_BRIDGE'
else:
def input_listdir(dir, wildcards):
for w in wildcards:
def input_listdir(dir, wildcards):
for w in wildcards:
- inputs['dirs'].add(dir + '/' + w)
+ inputs['dirs'].add(os.path.join(dir, w))
if options.generate_collector:
return []
dirs = os.listdir(options.root + dir)
if options.generate_collector:
return []
dirs = os.listdir(options.root + dir)