Skip to content

Commit 22963a9

Browse files
committed
RF: Rename Session.http to Session.session
1 parent 5c036c0 commit 22963a9

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

psychopy/projects/pavlovia.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def __init__(self, id, rememberMe=True):
141141
# Get info from Pavlovia
142142
if isinstance(id, (float, int, str)):
143143
# If given a number or string, treat it as a user ID / username
144-
self.info = self.session.http.get(
144+
self.info = self.session.session.get(
145145
"https://pavlovia.org/api/v2/designers/" + str(id)
146146
).json()['designer']
147147
# Make sure self.info has necessary keys
@@ -410,16 +410,16 @@ def startSession(self, token):
410410
self.userFullName = self.gitlab.user.name
411411
self.authenticated = True
412412
# Setup http session
413-
self.http = requests.Session()
414-
self.http.headers = {'OauthToken': token}
413+
self.session = requests.Session()
414+
self.session.headers = {'OauthToken': token}
415415
else:
416416
# Setup gitlab session
417417
if parse_version(gitlab.__version__) > parse_version("1.4"):
418418
self.gitlab = gitlab.Gitlab(rootURL, timeout=10, per_page=100)
419419
else:
420420
self.gitlab = gitlab.Gitlab(rootURL, timeout=10)
421421
# Setup http session
422-
self.http = requests.Session()
422+
self.session = requests.Session()
423423

424424
@property
425425
def user(self):
@@ -494,18 +494,18 @@ def __init__(self, term, sortBy=None, filterBy=None, mine=False):
494494
session = getCurrentSession()
495495
if mine:
496496
# Display experiments by current user
497-
data = session.http.get(
497+
data = session.session.get(
498498
f"https://pavlovia.org/api/v2/designers/{session.userID}/experiments?search={term}{filterBy}",
499499
timeout=10
500500
).json()
501501
elif term or filterBy:
502-
data = session.http.get(
502+
data = session.session.get(
503503
f"https://pavlovia.org/api/v2/experiments?search={term}{filterBy}",
504504
timeout=10
505505
).json()
506506
else:
507507
# Display demos for blank search
508-
data = session.http.get(
508+
data = session.session.get(
509509
"https://pavlovia.org/api/v2/experiments?search=demos&designer=demos",
510510
timeout=10
511511
).json()
@@ -617,7 +617,7 @@ def refresh(self):
617617
self._info = None
618618
# for a new project it may take time for Pavlovia to register the new ID so try for a while
619619
while self._info is None and (time.time() - start) < 30:
620-
requestVal = self.session.http.get(
620+
requestVal = self.session.session.get(
621621
f"https://pavlovia.org/api/v2/experiments/{self.project.id}",
622622
).json()
623623
self._info = requestVal['experiment']

0 commit comments

Comments
 (0)