Skip to content
This repository has been archived by the owner on Sep 23, 2024. It is now read-only.

Use consistent names for requests objects #145

Merged
merged 1 commit into from
May 22, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions skt/reporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,12 @@ def fetchdata(self):
if not self.url:
return []

r = requests.get(self.url)
response = requests.get(self.url)

try:
str_data = r.text[r.text.index("Linux version %s" % self.kver):]
str_data = response.text[
response.text.index("Linux version %s" % self.kver):
]
except ValueError:
# Targeted kernel didn't even start booting
str_data = ''
Expand Down Expand Up @@ -212,8 +214,8 @@ def __init__(self, cfg):
self.mergedata = None

def infourldata(self, mergedata):
r = requests.get(self.cfg.get("infourl"))
for line in r.text.split('\n'):
response = requests.get(self.cfg.get("infourl"))
for line in response.text.split('\n'):
if line:
idata = line.split(',')
if idata[0] == 'base':
Expand Down Expand Up @@ -264,9 +266,9 @@ def update_mergedata(self):
mergedata = self.stateconfigdata(mergedata)

if self.cfg.get("cfgurl"):
r = requests.get(self.cfg.get("cfgurl"))
if r:
mergedata['config'] = r.text
response = requests.get(self.cfg.get("cfgurl"))
if response:
mergedata['config'] = response.text
else:
with open("%s/.config" % self.cfg.get("workdir"), "r") as fp:
mergedata['config'] = fp.read()
Expand Down Expand Up @@ -413,10 +415,10 @@ def getjobresults(self):

if slshwurl is not None:
if system not in minfo["short"]:
r = requests.get(slshwurl)
if r:
response = requests.get(slshwurl)
if response:
result.append("\nMachine info:")
result += r.text.split('\n')
result += response.text.split('\n')
minfo["short"][system] = jidx
else:
result.append("Machine info: same as #%d" %
Expand Down