Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

implement Context Manager directly #90

Merged
merged 1 commit into from
Oct 13, 2023
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
12 changes: 7 additions & 5 deletions spalloc_client/protocol_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
import json
import socket
from threading import current_thread, RLock, local
from spinn_utilities.abstract_context_manager import AbstractContextManager
from spinn_utilities.overrides import overrides
from spalloc_client._utils import time_left, timed_out, make_timeout


Expand Down Expand Up @@ -51,7 +49,7 @@ def __init__(self):
self.sock = None


class ProtocolClient(AbstractContextManager):
class ProtocolClient(object):
""" A simple (blocking) client implementation of the `spalloc-server
<https://github.com/SpiNNakerManchester/spalloc_server>`_ protocol.

Expand Down Expand Up @@ -105,9 +103,13 @@ def __init__(self, hostname, port=22244, timeout=None):
self._notifications_lock = RLock()
self._default_timeout = timeout

@overrides(AbstractContextManager._context_entered)
def _context_entered(self): # pragma: no cover
def __enter__(self):
self.connect(self._default_timeout)
return self

def __exit__(self, exc_type, exc_val, exc_tb):
self.close()
return False

def _get_connection(self, timeout):
if self._dead:
Expand Down