Skip to content

Commit 8db8bec

Browse files
Merge branch 'main' into ci-fixes
2 parents 17f3960 + 775edf3 commit 8db8bec

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

customerio/client_base.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,11 @@ def _build_session(self):
108108
return session
109109

110110
def _close(self):
111+
<<<<<<< ci-fixes
111112
if not self.use_connection_pooling and self._current_session is not None:
113+
=======
114+
# if we're not using pooling; clean up the resources.
115+
if (not self.use_connection_pooling and self._current_session is not None):
116+
>>>>>>> main
112117
self._current_session.close()
113118
self._current_session = None

0 commit comments

Comments
 (0)